Update from Issue #235

New code from Issue #235. May still be some events that are not returned. Failed (s)vMotions will not be listed.