Dar 2752

@gabrys Please take a look too.