Merge pull request #179 from wbprice/develop

Develop
Revert "Develop"
Merge pull request #180 from c4hrva/revert-179-develop

Revert "Develop"