Hotfix for buggy build
Merge pull request #200 from jorgesilva/develop

Hotfix for buggy build