added text
Merge branch 'init.setup' into develop