bump version
Merge branch 'develop'
add travis.yml