Merge pull request #7 from y-higuchi/yoshi-merged

Merged several feature
Clean source code
Clean source code
Clean source code