Prepare 0.3.1 release
Add test
Add .travis.yml
Merge branch 'develop'

Conflicts:
	package.json