Merge PR #305