This fixes #1 and fixes #4.
Merge pull request #60 from jriverac/dob_fix

This fixes #1 and fixes #4.