Improve image handling & correct some typos
Merge pull request #36 from kalbermattenm/img

Improve image handling & correct some typos