Merge pull request #71 from mpeuster/master

Support for new descriptor format.