Markup
Markup on scripts
Merge branch 'feature/markup' into develop