Changes for Pull Request #15