Merge pull request #5 from orignal/revert-4-master

Revert "sync with upstream"