Fixed #19
Fixed #20