Merge pull request #9 from marcovala/master

[CLEANUP] - Cleanup before release