Issue #6

Adding correct language support to annotations