Merge pull request #122 from bogwonch/better-images