Merge pull request #34 from Manishearth/test

Forward test to master
use sandbox