Update readme.md with travis button
Update readme.md
Update readme.md
Update readme.md
Merge branch 'release/0.2'
Merge branch 'release/0.2.1'
Fixes merge conflicts
Merge branch 'master' into develop