Bugfix: variable name collision. Close #11
Improved the demo
Merge branch 'gh-pages'