Merge branch 'develop'
Add .travis.yml
Fix failing test
Merge branch 'master' into develop