Rollback to version 1.5.0
Merge branch 'travis'