Merge pull request #3 from kurodaiori/master

a