syncing develp and master.

-- add future events and CLI for getting pending future events.