Merge pull request #28 from szilardhuber/master

Metadata service + client
Merge remote-tracking branch 'upstream/master'