Merge branch 'develop'
modifies travis setup