some test with annotations to optimize the code
moved to annotations (optimized the reader)
adjusted the rest of the classes for annotaions
Merge pull request #1 from bromix/annotation

Annotation