Fixing #90
Merge pull request #92 from rodms10/fix-90

Fixing #90