Merge pull request #1 from metermaid/development

Thumbnails