bug fixes;
Merge branch 'master' of https://github.com/jeromebanks/brickhouse