Merge pull request #2 from evennia/master

Merge with master fork