Merge pull request #1 from mchung/master

Update branch