Merge branch 'features'
Refactor travis.yml
Update readme