Added annotations
Merge remote-tracking branch 'origin/master'
Rewrote query language, added example and wrote first tests