Issue#9

Fixed Issue #9