changes made in branch1
Merge pull request #1 from hkderekchan/branch1

changes made in branch1