all the changes from katy
Merge branch 'master' of https://github.com/mcuringa/vid-analyzer