David Horak

@alturkovic please have a look. Also if merged can you release `2.1.0` with this change or do you have any other plans for next version?