bug fixed and added more demo