jgarzik Merge pull request #25 from dgenr8/master