Fixed Travis Build
Merge branch 'hotfix/FixTravisBuildErrors'