Finish 3744

This finishes the great pull request started by @mickaelandrieu in #3744.
when using the shortcut, you don't have to seperate it with a space (as shown in the examples)