Updated project and demo.
Merge branch 'release/0.2.0'