Merge branch 'dev'
Merge branch 'dev'
add travis config
update README