upgrade to bem-core v2, enb
Merge pull request #2 from dab/master

upgrade to bem-core v2, enb