xml declaration keep track of indent
Merge branch 'master' into NowTV-Iceberg-master
fixes #10