Implements annotations

Merged Amir MOHAMMADI requested to merge refactoring_2016 into master

Merge request reports