simplify bbox sampler interface, fix some indentation
Merge branch 'new-branch'