Resolve hanssonr/2DV407#5
Merge pull request #6 from sj222eu/master

Resolve hanssonr/2DV407#5