CR fixes
Merge pull request #3 from javers/type_unification

Type unification
project.version up to 0.4.0-SNAPSHOT
Merge branch 'master' into spock_test
revert spring test