Feature/svendk 225 184 230

Added changes according to comments. 11 commits.