remove old code breaking shortcut parser
Merge pull request #12 from stoecker/master

remove old code breaking shortcut parser
Merge remote-tracking branch 'upstream/master'