Minor changes in the demo + fixed wrong doc
Minor bug