Short names
Merge pull request #228 from TazeTSchnitzel/shortNames

Short names