- Updates for travis ci
Merge branch 'hotfix/fixes-for-ci'