Fixed #21
Fixed #26