Merge pull request #1 from fontanalorenzo/develop

Workaround