fixed defaults for boolean
Merge remote-tracking branch 'origin/master'