PR for commenting

Here comments are welcome!
@dkron, @vkuznetsov, @Strech