My Fixes


Addresses issue #122