Issue/307

@Lynngre  can you merge please?