Updated demo and library