Fixed #10
Fixed #9