Better initialization
Merge branch 'master' of github.com:BenjaminVanRyseghem/NewBrowser