Fixed the annot patch
Merge pull request #30 from vbmithr/master

Fix part of #22