Merge branch 'hotfix/31'

Close #31
Fix annotation
Merge pull request #42 from neeckeloo/fix-annotation

Fix annotation
Merge branch 'hotfix/42' into develop

Forward port #42