Fix a bug
Merge pull request #3 from Zoddo/develop

Fix a blocker bug