mnwright Merge pull request #37 from jsta/patch-1