Image fixes
Merge pull request #13 from MichalPaszkiewicz/master

Image fixes