Fix multiple history starting points #56

This only contains a failing test, which need to be...uhm...fixed :-)