Merge pull request #2 from techdivision/0.5.8-beta

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

reviewed with 0.5.8-beta7