ysugimoto Merge pull request #5 from eiriksm/patch-1