Merge pull request #11 from EQEmu/master

Merge of 11-08-2014