small mods
Merge branch 'task-14-serviceloader-refactoring-of-syntax-for-@-annotations'