Configuration improvements, minor bugfixes
Merge remote-tracking branch 'origin/master'