Closed #13
Fixed #11
Closed #9