Merge Yu and Jaebin's code into master branch (extracted from Yu's) rar
file.