Add a comment
Provide default image ids (fixes #10)