Fixed default settings and other minor changes
Merge remote-tracking branch 'origin/master'