Revert "merging"
Merge pull request #2 from atheiman/revert-1-master

Revert "merging"