merging the Inprogress branch to master #20

Closed hyunhwan-jeong closed 4 years ago