Pull Request for #16