Issue #7

Resolved both issues #7 & #8