fallback and regroup
merged
Merge pull request #23 from brain-murphy/brian-branch

Brian branch