Closed #11
Fixed #11 and #10