Resolves Issue #6 & Issue #7