Merge from tag 0.3.2 to 0.4.0-SNAPSHOT
Merge pull request #5 from AgileSpirit/master

Merge from tag 0.3.2 to 0.4.0-SNAPSHOT