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

Revert "Revert "Merge from Master""