Fixing Issue #7

Resolves Issue #7