fix for descriptor element; refactoring
added specs; fixed some issues subsequently
Merge pull request #230 from mdsol/fix_descriptor_element

fix for descriptor element; refactoring