Use (function($){...})(jQuery) pattern
Merge remote-tracking branch 'origin/master'