Merge the develop branch
Add travis
typo:(
Merge branch 'master' into develop