Resolves Issue #232