Merge branch 'master' into development
Update Travis-CI
Merge branch 'development'