Resolves Issue #163 and #191