Merge pull request #122 from nZEDb/dev

Move some settings, update guide.
Wrong place.