Merged lazyblum's [mcom] tag changes with some minor alterations.