Merge pull request #1 from zarsky/master

Reverting