Revert "Update from remote upstream"
Merge pull request #2 from snickers2029/revert-1-develop

Revert "Update from remote upstream"