Merged Pull Request #2