Fixing issue #10. Starting working on issue #11