Switch to knuckle width

Accept pull request to merge into master.