Merge pull request #255 from erickcantwell/master

[MMO-94] Added user ecantwell