merges PR #243