Merge pull request #222 from goranche/master

maybe an else case for events without pictures would be nice... *sigh*