Merge pull request #218 from jgarzik/fee-update