Merge pull request #1 from fossasia/master

Update fork
Improved image scaling
Merge pull request #131 from ty221/master

Improved image scaling