Address concerns in Pull Request #41.