Merge and resolve pull request #258 from mtjandra/IZPACK-1151
    
[IZPACK-1151] - Shortcut Improvements
Merge branch 'mtjandra-IZPACK-1151'