Closes #141
Updated ThumbnailController
Merge branch 'issue-141' into develop