handle Expect better
update readme