Merge pull request #28 from EQEmu/master

Merge of 12-03-2014