Merge pull request #4 from EQEmu/master

Merge of 11-03-2014