Merge pull request #1 from dtbartle/master

good