Issue 799

Please test, it is the first time I play with settings... 
Fixes #799 once merged..