Resolves Issue #81

Resolves Issue #81