Merge pull request #148 from dyve/master

Fix problems with master branch
Fixing settings documentation
Release 4.8.2, branches fixed
Merge branch 'release/4.8.2'