Fixed #11   and Fixed #10