Merge pull request #3 from marcovala/master

[CLEANUP] - Cleanup before release