Merge pull request #513 from cjdelisle/feature-hardening