Bug Fixes

Fixing #97 and #98.