merge zyyang/master to jweese/master