Fixed #3
Fixed #10