Build 0.5.22 - Markup fix