Patch 1

Addresses issues #65 and #66.