Resolves Issue #275