Konstantin

I'd appreciate it if this was merged as well.

@tmm

Any updates on this?