Fix issue #5
Fix issue #1