Added template and demo 3, polished demo 1