Merge pull request #4 from zgolman/master

Merge with Master