Merge pull request #52 from kkrrjp/iss-51