Fixed #20
Fixed #19