Functional descriptor service
Merge pull request #90 from dejan-brkic/master

Descriptor service