Merge pull request #124 from bogwonch/dynamic-image-sizes