added more specific functions for demo
Merge branch 'master' of github.com:jonleung/magicwand