Allow more than one event ;)
merged from master