Revert "Merge from Master"
Merge pull request #45 from Fox-McCloud/revert-44-master

Revert "Merge from Master"