Fixed #9
Fixed #10
Fixed #11