Fixes according to BEMINFO-445
Merge pull request #10 from jk708/beminfo-445

Fixes according to BEMINFO-445