beaton commit
Merge pull request #4 from beaton32/eaton_branch

beaton commit