Hotfix, this is a huge bug.
Merge pull request #45 from Firesphere/release/1.0

Hotfix, this is a huge bug.