Resolves Issue #241 and #242