Manual merge for PR #108