add definitions ( setting and owner )
Merge branch 'origin/master'