adds Dave's changes
Merge branch 'hugentoblerd-master'