Merge pull request #7 from plopesc/7.x-1.x

Improve test page content generation