Fix
Fixed issue #8
Fix