Fixed #11 and #10