0626
Merge pull request #5 from nishiko/master

0626