Merge branch 'release/v1.2.1' into develop
TravisCI changes
Merge branch 'travisci' into develop
Remove 'travisci' from the yml
Adjusted README
Merge branch 'develop'