Revert "Develop"
Merge pull request #2 from tomcha/revert-1-develop

Revert "Develop"