Merge branch 'add_data_descriptor'
(fixes #13)