Shortened names
Merge pull request #67 from shummi/master

Shortened names