Changes for pull request #11