Fix image building
Merge pull request #3 from jberkel/fix-image

Closes #2