Resolves Issue #227