Added travis support
Merge branch 'pull-req/travis' into develop