testing branch 1
Merge pull request #1 from waichan/branch1

testing branch 1 pull request