Pull Request: JQuery Fixes

@ahmedhagii