Fixed #9
Fixed #10