Addresses comments from PR #291.

@tojofo addresses your comment from #291