Clean up example
Update README
Merge branch 'v2.0'