markhuot Merge pull request #344 from redboer/patch-1