Resolves Issue #258