Hotfixes
Merge pull request #5 from dvianello/develop

Hotfixes