Merge pull request #241 from dotch/master

rebuilt including new and updated components
Merge pull request #244 from dotch/master

added brick form