Merge pull request #35 from marcovala/master-5.0

[CLEANUP] - Cleanup before release