Fixes the Bug

Fixes #2
Crusher Fixes #2
Merge branch 'develop'