Merge pull request #662 from sexnothing/user

Message style bug fixed
Merge pull request #663 from sexnothing/user

Comment style bug fixed
Comment style bug fixed