#94 Address issues raised in pull request