Merge pull request #6 from EricssonResearch/develop

Develop
Fix issue introduced at testing