KAZOO-2715
Merge pull request #422 from onnet/KAZOO-2715

Ok looks good. Thanks Kirill.