Feature/323 324 328 330 331 335 343 357 

This could be fixed aswell.