branch2
Merge pull request #19 from darnould/branch2