Merge branch 'master' of https://github.com/nZEDb/nZEDb into dev
Merge pull request #33 from nZEDb/dev

Dev
Merge branch 'master' of https://github.com/nZEDb/nZEDb into dev
Change the advanced options.