Added travis-ci config
Merge branch 'master' into devel
Updated Changes