Updated the doc and demo