Merge pull request #3 from techdivision/0.5.8-beta

merging upstream
bugfix: tampered my own classes
bugfix: minor errors within the annotations
Merge pull request #97 from wick-ed/0.5.8-beta

reviewed with 0.5.8-beta7