Updated example with latest changes from master