Updated examples according to master.