Added \colspan and \rowspan macro