Addressed comments by @jrjohansson on PR #90.