fixes and debugs
Merge branch 'master' of github.com:locaweb/bricklayer