Add setting markup to the creator
Merge remote-tracking branch 'origin/master'