fixes #121
Merge pull request #129 from royrusso/_99_2

fixes #121