Settings improved & simplified.
Merge branch 'develop' into gh-pages
Stable development build.