@lukaszpiotr please look at current version of comment, i've modified it a bit in meantime.