Resolves Issue #4