Fixed some bugs in annotation.
Merge branch 'master' of https://github.com/abulovic/tiny-binner