Revert "Update from upstream"
Merge pull request #53 from innotech/revert-52-master

Revert "Update from upstream"