refactoring of annotations
Merge pull request #57 from wick-ed/0.5.8-beta

reviewed with 0.5.8-beta7