Merging Pavel fork

@Pllin, could you please give me a go ahead with this by saying :+1: ?