added thumbnailing
Merge remote-tracking branch 'origin/feature/thumbnail'