Merge pull request #1 from seznam/master

attempt