Merge branch 'release/v0.1.0'
Merge branch 'develop'
Merge branch 'develop'
travis now builds MS2