New feature

@jakub-dzon, please review