Merged Pull Request #484