merge changes
Merge pull request #21 from brain-murphy/brian

merge changes