fix bug where additinal attributes were not returned
Merge branch 'dev'