Merge pull request #6 from ichinco/personal

Merge pull request #5 from ichinco/master
Merge pull request #8 from ichinco/master

Merge pull request #6 from ichinco/personal