Bugfixes, jQuery dependency added
Merge remote-tracking branch 'origin/master'