Re-apply "Better clamp and wrap variable names."
Merge pull request #11 from OddBloke/master

Re-apply "Better clamp and wrap variable names."