Merged changes, fixed demo

Merged @mechanica's changes, fixed demo, got rid of redundant jQuery dependency.