Merge pull request #1 from seznam/master

attempt
Merge pull request #9 from burlog/master

Merge pull request #1 from seznam/master