Resolves Issue #234