Merge PR #39