reset 672bc25591dc1dd5aded96c882b83ba66a5ca3ad
fix conflict
update message format
clear something-useless
Merge pull request #4 from gooo000/master

update message format