Merge pull request #33 from marcovala/master

[CLEANUP] - Cleanup before release