hadley Merge pull request #25 from espinielli/patch-1