Merge and close PR #5, as amended