make changes recommended in Issue 97
Merge pull request #112 from wdouglascampbell/Issue97

make changes recommended in Issue 97