Image scaling + bugfixes
Merge pull request #71 from Peda1996/fabian1995-master

Image scaling + bugfixes