Fix for #97

Fix for #97 -- parts of #65 will still need to be addressed.
Merge pull request #99 from Technical-13/patch-2

Fix for #97