Fixed issue #8. Created issue #10