Resolves Issue #231