Add support for media within annotations
Merge branch 'master' of https://github.com/anvc/scalar