Merge pull request #227 from okiru/patch-1