Resolves Issue #2 & #3

Resolves Issue #2
Resolves Issue #3