Add test
Add .travis.yml
Merge branch 'develop'