getting 0.4.0 resolved issues into 0.3.*
Merge pull request #95 from fabien-d/mergeIssues

getting 0.4.0 resolved issues into 0.3.*