Merged Pull Request #4