Version 0.1 - Handle history fix