Commented out drag and drop, full working example now
Merge branch 'master' into gh-pages