WIP
Merge pull request #1 from sergevanginderachter/nobrowser

nobrowser pull