Bringing in Pull Request #11 from the original fork.