integrate brick
fix conflicts
Merge pull request #1 from jlongster/master

integrate brick