Updated the demo app and .gitignore
Updated changelog
Merge branch 'hotfix/0.2.1'