Fix issue 9
Close issue #9
Fix issue #9