refactoring of annotations
Merge pull request #8 from wick-ed/master

reviewed with 0.5.8-beta7