closes #201 by integrating code review comment