Add the latest code from master and the example