follow up from code review
Merge pull request #56 from brucehoff/develop

follow up from code review