Updated doc and demo