Resolves Issue #81