Patch from the CMS
Merge pull request #210 from wilsonge/patch-2

Patch from the CMS