commiting branch 2

commiting branch 2
Merge pull request #2 from ablackm/branch2

commiting branch 2