New feature

@jakub-dzon, please review
Too many bangs...