Updated for 0.2.0
Merge branch 'step-8-dev'
Updated readme
Merge branch 'step-8-dev'