Fixed #11
Fixed #9