Merge pull request #95 from abeaumont/clhs