Jerrypeng initial

put this in master