Merge pull request #15 from berjoyner/BerBranch

Ber branch
For Mike