Merged PR #384