Wenbin

merging wenbin branch