Merge pull request #11 from InCNTRE/master

Conformance Test-Suite 2