Working version

Erlingrequested to merge
erling-dev into master

Merge request reports