Resolves Issue #160