Better support for browsers back button
Optimised build
Merge branch 'v2'