bug 753

All review comments addressed from PR #355(closed).