Dongmin file

compare master and my branch: fdl042