folded demos into main source branch