Add possibility to parse custom attributes
Merge remote-tracking branch 'garnett/master'