Merge pull request #12 from touhonoob/master

update
commit
merge
commit