Revert "update from upstream"
Merge pull request #2 from gajop/revert-1-master

Revert "update from upstream"