address pull request #107 comments