Merge pull request #62 from mdeters/bv-cleanup