Resolves Issue #262