Added comments
Merge branch 'master' of https://github.com/dabelknap/DPS

Conflicts:
	gen_events.cc