Merge pull request #29 from Manishearth/test

Forward test to master
Merge pull request #30 from Manishearth/master

Merge pull request #29 from Manishearth/test