Resync from master
New code with SimpleXML in progress
Alpha #1