[#1] Improve handling of shortcuts
[#2] Compatibility with jQuery 1.9.x