Update from PR #27