bob branch
Merge pull request #1 from AndrewManning/bob

bob branch