Emergency hotfix.
Merge pull request #28 from Firesphere/Development

Emergency hotfix.