Merge pull request #31 from Manishearth/test

Merge pull request #30 from Manishearth/master