Merge branch 'release/0.0.2'
Update .travis.yml

add pillow
fix conflict