resolve FormatException
Merge branch 'master' of https://github.com/MSGorilla/MSGorilla.git