merged the branch
Merge pull request #2 from csegbers/branchtest

merged the branch