Merge PR #21