Issue #8

Fixed Issue #8