Updated Demo, added v1.2.1
Merge branch 'master' into gh-pages