Added markup
Fixed language
Merge branch 'iss53'
Mama
Dady
Fix js