added namespace and updated demo