Merge pull request #7 from ProjectSWGCore/master

pull
Merge remote-tracking branch 'origin/master'
Merge pull request #9 from ProjectSWGCore/master

pull
Fixed merge error
Merge pull request #1205 from zingzing175/master

Fixed merge error