Updates Issues #65 and Fixes #67