Move annotation mapping to class a property to make it easier to add new custom annotations
Merge pull request #2 from aik099/master

Easier annotation adding