Dan test branch

Dan,

I am not sure how to merge your changes in from your branch.  Do I need this pull request