Added defaults values in XML
Merge remote-tracking branch 'origin/master'