made an oopsie - images got rendered in the bubble even when not available
Merge remote-tracking branch 'upstream/master'
Merge pull request #237 from goranche/master

fixed an oopsie
Merge branch 'master' into deployment