Fixed broken markup
Merge branch 'beta'