Fixed type classification for annotations
Hierarchy class definitions toString for better debug
Merge branch 'master' of github.com:davidbrazdil/dexter