Revert "merge from upstream"
Merge pull request #2 from privatedata/revert-1-master

Revert "merge from upstream"