Merge branch 'development'
Testing Travis.ci
Merge branch 'master' into development