Updating crichton-demo from latest in develop