shortened namespace
Merge pull request #44 from rapid2k1/master

shortened namespace