dmrodz Merge pull request #9 from jsta/patch-1