merge
merger
temp
Merge pull request #22 from brain-murphy/brian-branch

Brian branch
merge
merger
fallback and regroup
merged