Resolves Issue #3