Added BoundingBox attachment
Merge branch 'bounding-box'