Mac OS X shortcut support added