Merge pull request #1 from diagnosa/master

pull haha
cmax
Merge pull request #2 from natsumiaya/master

cmax