Incorporate suggestions and update the example/documentation