Add #521 - second attempt

Thanks!
I hope it will be merged soon :)