Changes for pull request #10