Issue #442 - Improve the samples markup