Merge pull request #109 from kkrrjp/iss-108