See Pull Request #50