more precise imports in AnnotationHandler
more tests
Merge branch 'master' of https://github.com/larsgrefer/cli