More detailed demo
Add a lot of new cases to demo
Demo fixes
Refactoring
Refactoring 1
Refactoring done
0.3.6