Start implementing Annotation (Modules)
Merge remote-tracking branch 'origin/master'