Applied changes requested by @IgorTimoshenko