Carry along E tags and add spaces
PEP 8
Merge pull request #114 from cmc333333/keep-emphasis-sxs

Keep emphasis sxs
Merge upstream