some changes
Merge branch 'master' of https://github.com/guilded-gms/com.guilded.gms