jh
Merge remote-tracking branch 'origin/master'
Add some image handling.