Merge pull request #30 from Manishearth/master

Merge pull request #29 from Manishearth/test
Merge pull request #31 from Manishearth/test

Merge pull request #30 from Manishearth/master