Merge pull request #2 from ProjectSWGCore/master

pull