Merge pull request #31 from jserver/master

Make converting underscores optional in CommandManager