Merge pull request #1 from marcovala/master

[CLEANUP] - Cleanup before release