update
Merge pull request #1000 from bem/issues/947@v2

update