Fixing Issue #79 and part of issue #2

Boom!