jwang1 commit master