Small fixes
Another small fix
Some final changes
Merge branch '0.1.0-cleaned-demo'
finalize version
Merge branch '0.1.0-cleaned-demo'