Added travis
Merge branch 'hotfix/update'