Merge pull request #5 from aik099/master

Be up to date, when developing BEM
Fixes #29
Fixes #28
Merge remote-tracking branch 'upstream/master'
Fixes #37
Merge branch 'master' into bem-alternative