Merge pull request #1 from ProjectSWGCore/master

merged to fork