Fix images crash
Merge branch 'master'
Fix #33