added data descriptor (fixes #13)
Merge branch 'add_data_descriptor'
(fixes #13)