Merge pull request #447 from ProjectSWGCore/master

Test