Feature/171 akvorsrup

@Lynngre could you please approve this pull request?