Revert "FIX?!"
Merge pull request #39 from Fox-McCloud/revert-38-master

Revert "FIX?!"