@danmcp, @gshipley: Please review my code changes for my pull request.
Thanks!