d
fix merge conflicts
Merge pull request #38 from oconn/bug

Bug