Resolves Issue #2