Merge pull request #71 from mpeuster/master
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 4 Apr 2016 12:52:20 +0000 (14:52 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 4 Apr 2016 12:52:20 +0000 (14:52 +0200)
Support for new descriptor format.


Trivial merge