Added travis
Merge branch 'patch-travis'