Bur_Sangjun working branch

Hello, this is Bur_Sangjun. Making a pull request as we discussed.