Merge pull request #299 from anzz1/patch-1