FIX: Quick fix to #155
Merge pull request #164 from danielballan/hotfix-annotate

FIX : Quick fix to #155