update
merged
Merge pull request #4 from touhonoob/master

Merged