Annotations party time!
Merge pull request #4 from ffbit/dev-annotations

Annotations party time!