Feature/svendk 306 210 298  262 181 304 289 283

A comment about why and what would be nice...