Some minor changes before merging
Merge pull request #7 from evennia/master

Some minor changes before merging