Merge pull request #5 from aik099/master

Be up to date, when developing BEM
Merge remote-tracking branch 'upstream/master'