epoberezkin Merge pull request #34 from willfarrell/patch-1