Merging in the zero_technical_debt branch. This should lighten the merge
effort for pull request #4.