Added/modified some useful aliases.
Merge pull request #2287 from rumpelsepp/master

Added/modified some useful aliases.