merged code hlim10, ssong25

merged code into master branch project