Manually merge PR #203