Merge pull request #7 from hatajoe/issue/6