Hopefully a fix for issue #40
Merge pull request #41 from Firesphere/Development

Hopefully a fix for issue #40