add travis config
update README
Merge branch 'dev'