Merge pull request #289 from c17r/patch-1