Merge branch 'release/0.1.1' into dev
fixing travis config
Merge branch 'dev'