Merge pull request #162 from Tak-MK/patch-1