Updated the demo with the lastest changes