Add annotation support and reorganize frame reading

Merged Amir MOHAMMADI requested to merge annot into master

Merge request reports