Update to use 0.1.0
Update README
Merge conflict fix