Added shortcut block
Fix for issue #2