Revert "Update from the original master"
Merge pull request #2 from bazarka/revert-1-master

Revert "Update from the original master"