branch4
Merge pull request #21 from darnould/branch4