Redo XML generation; add field tag with name attribute and field value inside tag
Merge remote-tracking branch 'bitbucket/master'