Integrating with Travis CI
Merge branch 'hotfix-travis' into develop