Issue #120: Updates for Pull Request