turn xml version, encoding and standalone into options with getters and setters
Merge remote-tracking branch 'origin/master'