issue/135

 - addresses some comments from Pull Request #302