Add travis file
Readme updated
Merge branch 'master' into develop