add feedback from pierce
Merge pull request #7 from shackbarth/460

add feedback from pierce