Merge pull request #10 from thewillhuang/hiroshi

Cleanup.
a
Merge branch 'master' into hiroshi

Conflicts:
	test/test.js