Infrastructure improvements. Closes #382
Merge pull request #383 from bem/issues/382@v2

Infrastructure improvements