Fixed #10 and #11