Merged Pull Request #3