Added history, Fix #21. Fix #20.