Fixed #10 Fixed #19