Merge pull request #25 from kkrrjp/iss-13

Merge pull request #25 from kkrrjp/iss-13