Merge chanages from PR #3