issue17,18,21_new

Ghost Userrequested to merge
issue17,18,21_new into master

Quite important branch that we forgot to merge to master..

Merge request reports