Revert "Merge From Master"
Merge pull request #34 from Fox-McCloud/revert-33-master

Revert "Merge From Master"