Integrating PR #18.