Merge pull request #1 from ProjectSWGCore/master

Patch 1