Merge pull request #74 from petevg/bug/fix-invalid-annotations