support for quads in bbox and sampletest
quad opt working
Merge branch 'master' into better_branch