Update for moot's markup change, close #213