first adjustments for travis ci
Merge branch 'master' into develop