New version, much better
Merge branch 'master' of https://github.com/bubka-/shorts