Merge branch 'release/0.1.7' into develop
fix travis
Merge branch 'release/0.1.7'