Fixing bs with address field.
Merge pull request #92 from carsonblack/7.x-1.x

Fixing bs with address field.