Resolves Issue #106