Merge pull request #1 from nickerso/master

Note that indexed annotations are kept updated.