Few alterations
Merge pull request #1 from ProjectSWGCore/master

Few alterations