Made history work across page reloads
merge changes