Better rendering
Merge pull request #1009 from samoht-2401/mc16

Better rendering