Merge pull request #3 from centraldesktop/feature/options

feature(safety)  Use an option type for optional elements to aid cleaner

.gitignore

@@ -1,4 +1,4 @@
-*.lock
+build
 vendor
 *.iml
 .idea

composer.json

@@ -1,27 +1,28 @@
 {
-    "name": "centraldesktop/protobuf-php",
+    "name"       : "centraldesktop/protobuf-php",
     "description": "PHP implementation of Google's Protocol Buffers",
-    "keywords": ["protobuf", "protocol buffer", "serializing"],
-    "homepage": "https://github.com/drslump/Protobuf-PHP",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
+    "keywords"   : ["protobuf", "protocol buffer", "serializing"],
+    "homepage"   : "https://github.com/drslump/Protobuf-PHP",
+    "type"       : "library",
+    "license"    : "MIT",
+    "authors"    : [
         {
-            "name": "Iván -DrSlump- Montes",
-            "email": "[email protected]",
+            "name"    : "Iván -DrSlump- Montes",
+            "email"   : "[email protected]",
             "homepage": "https://github.com/drslump/Protobuf-PHP"
         }
     ],
-    "bin": ["protoc-gen-php.bat", "protoc-gen-php.php"],
-    "require": {
-        "php"             : ">=5.3.0",
-        "symfony/console" : "2.*",
-	"ext-mbstring" : "*"
+    "bin"        : ["protoc-gen-php.bat", "protoc-gen-php.php"],
+    "require"    : {
+        "php"                : ">=5.3.0",
+        "ext-mbstring"       : "*",
+        "phpoption/phpoption": "1.4.0",
+        "symfony/console"    : "2.*"
     },
     "require-dev": {
-        "phpunit/phpunit"     : "3.7.*"
-    },    
-    "autoload": {
+        "phpunit/phpunit": "3.7.*"
+    },
+    "autoload"   : {
         "psr-0": {
             "DrSlump": "library/"
         }