Fixed #22.
Fixed #21.