Merge pull request #303 from jrmithdobbs/demystify-magic-numbers