Resolves Issue #8