Fixes History and Router, issue #60

Fixes #60