Fixed broken XML caused by the merge of two unrelated pull requests
Merge pull request #161 from richardszalay/master

Fixed broken XML caused by the merge of two unrelated pull requests