Added support for '~' shortcut