diff --git a/README.md b/README.md
index 1b322ada..5a55f7fb 100644
--- a/README.md
+++ b/README.md
@@ -60,12 +60,4 @@ foreach ($schema->getAttributes() as $attr){
 foreach ($schema->getAttributeGroups() as $attrGroup){
 
 }
-
-
 ```
-
-Note
-----
-
-I'm sorry for the *terrible* english fluency used inside the documentation, I'm trying to improve it.
-Pull Requests are welcome.
diff --git a/composer.json b/composer.json
index 784a7ab8..1f3e59a1 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,7 @@
 		"php" : ">=5.4.0"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "^4.8|^5.0",
-		"sami/sami" : "^2.0"
+		"phpunit/phpunit" : "^4.8|^5.0"
 	},
 	"autoload" : {
 		"psr-4" : {
@@ -33,7 +32,7 @@
 	},
 	"extra" : {
 		"branch-alias" : {
-			"dev-master" : "0.1-dev"
+			"dev-master" : "0.2-dev"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/sami.php b/sami.php
deleted file mode 100644
index d1080648..00000000
--- a/sami.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-use Sami\Sami;
-use Symfony\Component\Finder\Finder;
-
-$iterator = Finder::create()
-    ->files()
-    ->name('*.php')
-    ->in('src')
-;
-
-
-return new Sami($iterator, array(
-    'theme'                => 'enhanced',
-    'title'                => 'GoetasWebservices XSD Reader',
-    'build_dir'            => __DIR__.'/apidoc',
-    'include_parent_data'  => true,
-    'default_opened_level' => 4,
-));
\ No newline at end of file
diff --git a/src/Schema/Element/Element.php b/src/Schema/Element/Element.php
index e3355cd1..864d1229 100644
--- a/src/Schema/Element/Element.php
+++ b/src/Schema/Element/Element.php
@@ -10,7 +10,7 @@ class Element extends Item implements ElementItem, ElementSingle
 
     protected $max = 1;
 
-    protected $qualified = true;
+    protected $qualified = false;
 
     protected $nil = false;
 
diff --git a/src/Schema/Schema.php b/src/Schema/Schema.php
index 4d436508..e96d3f65 100644
--- a/src/Schema/Schema.php
+++ b/src/Schema/Schema.php
@@ -14,7 +14,7 @@
 class Schema
 {
 
-    protected $elementsQualification = true;
+    protected $elementsQualification = false;
 
     protected $attributesQualification = false;
 
diff --git a/src/SchemaReader.php b/src/SchemaReader.php
index 0ec73987..aee4140e 100644
--- a/src/SchemaReader.php
+++ b/src/SchemaReader.php
@@ -148,8 +148,8 @@ private function schemaNode(Schema $schema, DOMElement $node, Schema $parent = n
         } elseif ($parent) {
             $schema->setTargetNamespace($parent->getTargetNamespace());
         }
-        $schema->setElementsQualification(!$node->hasAttribute("elementFormDefault") || $node->getAttribute("elementFormDefault") == "qualified");
-        $schema->setAttributesQualification(!$node->hasAttribute("attributeFormDefault") || $node->getAttribute("attributeFormDefault") == "qualified");
+        $schema->setElementsQualification($node->getAttribute("elementFormDefault") == "qualified");
+        $schema->setAttributesQualification($node->getAttribute("attributeFormDefault") == "qualified");
         $schema->setDoc($this->getDocumentation($node));
         $functions = array();