Fixes #42
Merge branch 'master' into bem-alternative