Merge pull request #29 from Manishearth/test

Forward test to master