TravisCI integration
Merge branch 'master' into interface_simplification