Fixed #28
Fixed #34