Merged PR #407