Merge pull request #27 from psu-stewardship/master

Cherry-picked commits to fix image scaling and thumbnailization