bugfix
bugfix
Merge branch 'travis_ci' into improved_build_travis_ci
Merge branch 'improved_build_fix' into improved_build_travis_ci