Bug for issue #4 fixed

Bug for issue #4 fixed