Issue #2
Merge branch 'bm-4.0.0'