Fix issue #5 and close

Resolved.