diff --git a/src/fr/devinsy/util/xml/XMLReader.java b/src/fr/devinsy/util/xml/XMLReader.java
index 1fc277d..57dd535 100644
--- a/src/fr/devinsy/util/xml/XMLReader.java
+++ b/src/fr/devinsy/util/xml/XMLReader.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2013-2014 Christian Pierre MOMON
+ * Copyright (C) 2017      Christian Pierre MOMON
  * 
  * This file is part of Devinsy-utils.
  * 
@@ -44,581 +45,573 @@ import fr.devinsy.util.xml.XMLTag.TagType;
  */
 public class XMLReader
 {
-    private static final Logger logger = LoggerFactory.getLogger(XMLReader.class);
+	private static final Logger logger = LoggerFactory.getLogger(XMLReader.class);
 
-    protected XMLEventReader in;
-    private XMLEvent nextEvent;
+	protected XMLEventReader in;
+	private XMLEvent nextEvent;
 
-    /**
+	/**
 	 * 
 	 */
-    protected XMLReader()
-    {
-        this.in = null;
-        this.nextEvent = null;
-    }
+	protected XMLReader()
+	{
+		this.in = null;
+		this.nextEvent = null;
+	}
 
-    /**
-     * 
-     * @param file
-     * @throws XMLStreamException
-     * @throws FileNotFoundException
-     */
-    public XMLReader(final File file) throws FileNotFoundException, XMLStreamException
-    {
-        this.nextEvent = null;
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        this.in = factory.createXMLEventReader(new FileInputStream(file), "UTF-8");
-    }
+	/**
+	 * 
+	 * @param file
+	 * @throws XMLStreamException
+	 * @throws FileNotFoundException
+	 */
+	public XMLReader(final File file) throws FileNotFoundException, XMLStreamException
+	{
+		this.nextEvent = null;
+		XMLInputFactory factory = XMLInputFactory.newInstance();
+		this.in = factory.createXMLEventReader(new FileInputStream(file), "UTF-8");
+	}
 
-    /**
-     * 
-     * @param target
-     * @throws XMLStreamException
-     */
-    public XMLReader(final InputStream source) throws XMLStreamException
-    {
-        this.nextEvent = null;
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        this.in = factory.createXMLEventReader(source);
-    }
+	/**
+	 * 
+	 * @param target
+	 * @throws XMLStreamException
+	 */
+	public XMLReader(final InputStream source) throws XMLStreamException
+	{
+		this.nextEvent = null;
+		XMLInputFactory factory = XMLInputFactory.newInstance();
+		this.in = factory.createXMLEventReader(source);
+	}
 
-    /**
-     * 
-     * @param target
-     * @throws XMLStreamException
-     */
-    public XMLReader(final Reader source) throws XMLStreamException
-    {
-        this.nextEvent = null;
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        this.in = factory.createXMLEventReader(source);
-    }
+	/**
+	 * 
+	 * @param target
+	 * @throws XMLStreamException
+	 */
+	public XMLReader(final Reader source) throws XMLStreamException
+	{
+		this.nextEvent = null;
+		XMLInputFactory factory = XMLInputFactory.newInstance();
+		this.in = factory.createXMLEventReader(source);
+	}
 
-    /**
-     * @throws XMLStreamException
-     * 
-     */
-    public void close()
-    {
-        if (this.in != null)
-        {
-            try
-            {
-                this.in.close();
-            }
-            catch (XMLStreamException exception)
-            {
-                exception.printStackTrace();
-            }
-        }
-    }
+	/**
+	 * @throws XMLStreamException
+	 */
+	public void close() throws XMLStreamException
+	{
+		if (this.in != null)
+		{
+			this.in.close();
+		}
+	}
 
-    /**
-     * This methods does a premonition act. Useful to detect end of a list.
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     */
-    public boolean hasNextStartTag(final String label) throws XMLStreamException
-    {
-        boolean result;
+	/**
+	 * This methods does a premonition act. Useful to detect end of a list.
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 */
+	public boolean hasNextStartTag(final String label) throws XMLStreamException
+	{
+		boolean result;
 
-        // Load next event.
-        if (this.nextEvent == null)
-        {
-            if (this.in.hasNext())
-            {
-                this.nextEvent = this.in.nextEvent();
-            }
-        }
+		// Load next event.
+		if (this.nextEvent == null)
+		{
+			if (this.in.hasNext())
+			{
+				this.nextEvent = this.in.nextEvent();
+			}
+		}
 
-        // Analyze next event.
-        if (this.nextEvent == null)
-        {
-            result = false;
-        }
-        else if ((this.nextEvent.isStartElement()) && (StringUtils.equals(this.nextEvent.asStartElement().getName().getLocalPart(), label)))
-        {
-            result = true;
-        }
-        else
-        {
-            result = false;
-        }
+		// Analyze next event.
+		if (this.nextEvent == null)
+		{
+			result = false;
+		}
+		else if ((this.nextEvent.isStartElement()) && (StringUtils.equals(this.nextEvent.asStartElement().getName().getLocalPart(), label)))
+		{
+			result = true;
+		}
+		else
+		{
+			result = false;
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLBadFormatException
-     * @throws XMLStreamException
-     */
-    public XMLTag readContentTag(final String label) throws XMLBadFormatException, XMLStreamException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLBadFormatException
+	 * @throws XMLStreamException
+	 */
+	public XMLTag readContentTag(final String label) throws XMLBadFormatException, XMLStreamException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, content tag [" + label + "] is expected.");
-        }
-        else if (result.getType() != TagType.CONTENT)
-        {
-            throw new XMLBadFormatException("Content tag [" + label + "] is missing.");
-        }
-        else if (!StringUtils.equals(label, result.getLabel()))
-        {
-            throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, content tag [" + label + "] is expected.");
+		}
+		else if (result.getType() != TagType.CONTENT)
+		{
+			throw new XMLBadFormatException("Content tag [" + label + "] is missing.");
+		}
+		else if (!StringUtils.equals(label, result.getLabel()))
+		{
+			throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     */
-    public XMLTag readEndTag(final String label) throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 */
+	public XMLTag readEndTag(final String label) throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, end tag [" + label + "] is expected.");
-        }
-        else if (result.getType() != TagType.END)
-        {
-            throw new XMLBadFormatException("End tag [" + label + "] is missing.");
-        }
-        else if (!StringUtils.equals(result.getLabel(), label))
-        {
-            throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, end tag [" + label + "] is expected.");
+		}
+		else if (result.getType() != TagType.END)
+		{
+			throw new XMLBadFormatException("End tag [" + label + "] is missing.");
+		}
+		else if (!StringUtils.equals(result.getLabel(), label))
+		{
+			throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     * @throws Exception
-     */
-    public XMLTag readListTag(final String label) throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 * @throws Exception
+	 */
+	public XMLTag readListTag(final String label) throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, tag [" + label + "] is expected.");
-        }
-        else if ((result.getType() != TagType.START) && (result.getType() != TagType.EMPTY))
-        {
-            throw new XMLBadFormatException("List tag [" + label + "] is missing.");
-        }
-        else if (!StringUtils.equals(label, result.getLabel()))
-        {
-            throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, tag [" + label + "] is expected.");
+		}
+		else if ((result.getType() != TagType.START) && (result.getType() != TagType.EMPTY))
+		{
+			throw new XMLBadFormatException("List tag [" + label + "] is missing.");
+		}
+		else if (!StringUtils.equals(label, result.getLabel()))
+		{
+			throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     * @throws Exception
-     */
-    public XMLTag readNullableContentTag(final String label) throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 * @throws Exception
+	 */
+	public XMLTag readNullableContentTag(final String label) throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, tag [" + label + "] is expected.");
-        }
-        else if (!StringUtils.equals(label, result.getLabel()))
-        {
-            throw new XMLBadFormatException("Nullable content tag [" + label + "] is missing.");
-        }
-        else if ((result.getType() != TagType.EMPTY) && (result.getType() != TagType.CONTENT))
-        {
-            throw new XMLBadFormatException("Nullable content tag [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, tag [" + label + "] is expected.");
+		}
+		else if (!StringUtils.equals(label, result.getLabel()))
+		{
+			throw new XMLBadFormatException("Nullable content tag [" + label + "] is missing.");
+		}
+		else if ((result.getType() != TagType.EMPTY) && (result.getType() != TagType.CONTENT))
+		{
+			throw new XMLBadFormatException("Nullable content tag [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     * @throws Exception
-     */
-    public XMLTag readNullableStartTag(final String label) throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 * @throws Exception
+	 */
+	public XMLTag readNullableStartTag(final String label) throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, start tag [" + label + "] is expected.");
-        }
-        else if ((result.getType() != TagType.START) && (result.getType() != TagType.EMPTY))
-        {
-            throw new XMLBadFormatException("Start tag [" + label + "] is missing.");
-        }
-        else if (!StringUtils.equals(result.getLabel(), label))
-        {
-            throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, start tag [" + label + "] is expected.");
+		}
+		else if ((result.getType() != TagType.START) && (result.getType() != TagType.EMPTY))
+		{
+			throw new XMLBadFormatException("Start tag [" + label + "] is missing.");
+		}
+		else if (!StringUtils.equals(result.getLabel(), label))
+		{
+			throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     * @throws Exception
-     */
-    public XMLTag readStartTag(final String label) throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 * @throws Exception
+	 */
+	public XMLTag readStartTag(final String label) throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, start tag [" + label + "] is expected.");
-        }
-        else if (result.getType() != TagType.START)
-        {
-            throw new XMLBadFormatException("Start tag [" + label + "] is missing.");
-        }
-        else if (!StringUtils.equals(result.getLabel(), label))
-        {
-            throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, start tag [" + label + "] is expected.");
+		}
+		else if (result.getType() != TagType.START)
+		{
+			throw new XMLBadFormatException("Start tag [" + label + "] is missing.");
+		}
+		else if (!StringUtils.equals(result.getLabel(), label))
+		{
+			throw new XMLBadFormatException("Tag with label [" + label + "] is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * Transducer graph :
-     * <ul>
-     * <li>START_DOCUMENT => HEADER TAG
-     * <li>START_ELEMENT(X) + START_ELEMENT(Y) => <X><Y> => START TAG
-     * <li>START_ELEMENT(X) + CHARACTERS(C) + START_ELEMENT(Y) => <X>SPACES<Y>=>
-     * START TAG
-     * <li>START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => <X>C</X> =>
-     * CONTENT TAG
-     * <li>START_ELEMENT(X) + END_ELEMENT(X) => <X></X> => <X/> => EMPTY
-     * <li>END_ELEMENT(X) => </X> => END TAG
-     * <li>END_DOCUMENT => FOOTER TAG
-     * </ul>
-     * 
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     * 
-     */
-    public XMLTag readTag() throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * Transducer graph :
+	 * <ul>
+	 * <li>START_DOCUMENT => HEADER TAG
+	 * <li>START_ELEMENT(X) + START_ELEMENT(Y) => <X><Y> => START TAG
+	 * <li>START_ELEMENT(X) + CHARACTERS(C) + START_ELEMENT(Y) => <X>SPACES<Y>=>
+	 * START TAG
+	 * <li>START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => <X>C</X> =>
+	 * CONTENT TAG
+	 * <li>START_ELEMENT(X) + END_ELEMENT(X) => <X></X> => <X/> => EMPTY
+	 * <li>END_ELEMENT(X) => </X> => END TAG
+	 * <li>END_DOCUMENT => FOOTER TAG
+	 * </ul>
+	 * 
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 * 
+	 */
+	public XMLTag readTag() throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        int level = 1;
-        boolean ended = false;
-        result = null;
-        XMLAttributes attributesBuffer = null;
-        QName nameBuffer = null;
-        StringList contentBuffer = null;
-        while (!ended)
-        {
-            //
-            XMLEvent event;
-            if (this.nextEvent != null)
-            {
-                event = this.nextEvent;
-                this.nextEvent = null;
-            }
-            else if (this.in.hasNext())
-            {
-                event = this.in.nextEvent();
-            }
-            else
-            {
-                event = null;
-            }
+		int level = 1;
+		boolean ended = false;
+		result = null;
+		XMLAttributes attributesBuffer = null;
+		QName nameBuffer = null;
+		StringList contentBuffer = null;
+		while (!ended)
+		{
+			//
+			XMLEvent event;
+			if (this.nextEvent != null)
+			{
+				event = this.nextEvent;
+				this.nextEvent = null;
+			}
+			else if (this.in.hasNext())
+			{
+				event = this.in.nextEvent();
+			}
+			else
+			{
+				event = null;
+			}
 
-            if (event == null)
-            {
-                ended = true;
-                result = null;
-            }
-            else
-            {
-                logger.debug("eventType=" + XMLTools.toString(event));
-                switch (level)
-                {
-                    case 1:
-                        switch (event.getEventType())
-                        {
-                            case XMLEvent.START_DOCUMENT:
-                                // START_DOCUMENT => START DOCUMENT TAG
-                                ended = true;
-                                result = new XMLTag(null, TagType.HEADER, null);
-                            break;
-                            case XMLEvent.START_ELEMENT:
-                                // START_ELEMENT(X) => ...
-                                nameBuffer = event.asStartElement().getName();
-                                attributesBuffer = new XMLAttributes(event.asStartElement().getAttributes());
-                                level += 1;
-                            break;
-                            case XMLEvent.END_ELEMENT:
-                                // END_ELEMENT(X) => </X> => END TAG
-                                ended = true;
-                                result = new XMLTag(event.asEndElement().getName(), TagType.END, null);
-                            break;
-                            case XMLEvent.END_DOCUMENT:
-                                // END_DOCUMENT => END DOCUMENT TAG
-                                ended = true;
-                                result = new XMLTag(null, TagType.FOOTER, null);
-                            break;
-                        }
-                    break;
-                    case 2:
-                        switch (event.getEventType())
-                        {
-                            case XMLEvent.START_ELEMENT:
-                                // START_ELEMENT(X) + START_ELEMENT(Y) => <X><Y>
-                                // => START TAG
-                                ended = true;
-                                result = new XMLTag(nameBuffer, TagType.START, attributesBuffer);
-                                this.nextEvent = event;
-                            break;
-                            case XMLEvent.CHARACTERS:
-                                // START_ELEMENT(X) + CHARACTERS(C) => ...
-                                contentBuffer = new StringList(50);
-                                contentBuffer.append(event.asCharacters().getData());
-                                level += 1;
-                            break;
-                            case XMLEvent.END_ELEMENT:
-                                // START_ELEMENT(X) + END_ELEMENT(X) => <X></X>
-                                // => <X/> => EMPTY
-                                ended = true;
-                                result = new XMLTag(nameBuffer, TagType.EMPTY, attributesBuffer);
-                            break;
-                            default:
-                                throw new XMLBadFormatException("Unexpected XMLEvent [" + event.getEventType() + "].");
-                        }
-                    break;
-                    case 3:
-                        switch (event.getEventType())
-                        {
-                            case XMLEvent.START_ELEMENT:
-                                // START_ELEMENT(X) + CHARACTERS(C) +
-                                // START_ELEMENT(Y) =>
-                                // <X>SPACES<Y> => START TAG
-                                ended = true;
-                                result = new XMLTag(nameBuffer, TagType.START, attributesBuffer);
-                                this.nextEvent = event;
-                            break;
-                            case XMLEvent.CHARACTERS:
-                                // START_ELEMENT(X) + CHARACTERS(C1) +
-                                // CHARACTERS(C2)=> ...
-                                contentBuffer.append(event.asCharacters().getData());
-                            break;
-                            case XMLEvent.END_ELEMENT:
-                                // START_ELEMENT(X) + CHARACTERS(C) +
-                                // END_ELEMENT(X) => <X>C</X>
-                                // => CONTENT TAG
-                                ended = true;
-                                result = new XMLTag(nameBuffer, TagType.CONTENT, attributesBuffer);
-                                result.setContent(contentBuffer.toString());
-                            break;
-                            default:
-                                throw new XMLBadFormatException("Unexpected XMLEvent [" + event.getEventType() + "].");
-                        }
-                    break;
-                    default:
-                        throw new XMLBadFormatException("Unexpected level [" + level + "].");
-                }
-            }
-        }
+			if (event == null)
+			{
+				ended = true;
+				result = null;
+			}
+			else
+			{
+				logger.debug("eventType=" + XMLTools.toString(event));
+				switch (level)
+				{
+					case 1:
+						switch (event.getEventType())
+						{
+							case XMLEvent.START_DOCUMENT:
+								// START_DOCUMENT => START DOCUMENT TAG
+								ended = true;
+								result = new XMLTag(null, TagType.HEADER, null);
+							break;
+							case XMLEvent.START_ELEMENT:
+								// START_ELEMENT(X) => ...
+								nameBuffer = event.asStartElement().getName();
+								attributesBuffer = new XMLAttributes(event.asStartElement().getAttributes());
+								level += 1;
+							break;
+							case XMLEvent.END_ELEMENT:
+								// END_ELEMENT(X) => </X> => END TAG
+								ended = true;
+								result = new XMLTag(event.asEndElement().getName(), TagType.END, null);
+							break;
+							case XMLEvent.END_DOCUMENT:
+								// END_DOCUMENT => END DOCUMENT TAG
+								ended = true;
+								result = new XMLTag(null, TagType.FOOTER, null);
+							break;
+						}
+					break;
+					case 2:
+						switch (event.getEventType())
+						{
+							case XMLEvent.START_ELEMENT:
+								// START_ELEMENT(X) + START_ELEMENT(Y) => <X><Y>
+								// => START TAG
+								ended = true;
+								result = new XMLTag(nameBuffer, TagType.START, attributesBuffer);
+								this.nextEvent = event;
+							break;
+							case XMLEvent.CHARACTERS:
+								// START_ELEMENT(X) + CHARACTERS(C) => ...
+								contentBuffer = new StringList(50);
+								contentBuffer.append(event.asCharacters().getData());
+								level += 1;
+							break;
+							case XMLEvent.END_ELEMENT:
+								// START_ELEMENT(X) + END_ELEMENT(X) => <X></X>
+								// => <X/> => EMPTY
+								ended = true;
+								result = new XMLTag(nameBuffer, TagType.EMPTY, attributesBuffer);
+							break;
+							default:
+								throw new XMLBadFormatException("Unexpected XMLEvent [" + event.getEventType() + "].");
+						}
+					break;
+					case 3:
+						switch (event.getEventType())
+						{
+							case XMLEvent.START_ELEMENT:
+								// START_ELEMENT(X) + CHARACTERS(C) +
+								// START_ELEMENT(Y) =>
+								// <X>SPACES<Y> => START TAG
+								ended = true;
+								result = new XMLTag(nameBuffer, TagType.START, attributesBuffer);
+								this.nextEvent = event;
+							break;
+							case XMLEvent.CHARACTERS:
+								// START_ELEMENT(X) + CHARACTERS(C1) +
+								// CHARACTERS(C2)=> ...
+								contentBuffer.append(event.asCharacters().getData());
+							break;
+							case XMLEvent.END_ELEMENT:
+								// START_ELEMENT(X) + CHARACTERS(C) +
+								// END_ELEMENT(X) => <X>C</X>
+								// => CONTENT TAG
+								ended = true;
+								result = new XMLTag(nameBuffer, TagType.CONTENT, attributesBuffer);
+								result.setContent(contentBuffer.toString());
+							break;
+							default:
+								throw new XMLBadFormatException("Unexpected XMLEvent [" + event.getEventType() + "].");
+						}
+					break;
+					default:
+						throw new XMLBadFormatException("Unexpected level [" + level + "].");
+				}
+			}
+		}
 
-        logger.debug("=> " + XMLTools.toString(result));
+		logger.debug("=> " + XMLTools.toString(result));
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param label
-     * @return
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     */
-    public XMLTag readXMLFooter() throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @param label
+	 * @return
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 */
+	public XMLTag readXMLFooter() throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, end document event is expected.");
-        }
-        else if (result.getType() != TagType.FOOTER)
-        {
-            throw new XMLBadFormatException("End document tag is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, end document event is expected.");
+		}
+		else if (result.getType() != TagType.FOOTER)
+		{
+			throw new XMLBadFormatException("End document tag is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @return
-     * @throws XMLException
-     * @throws XMLStreamException
-     * @throws XMLBadFormatException
-     */
-    public XMLTag readXMLHeader() throws XMLStreamException, XMLBadFormatException
-    {
-        XMLTag result;
+	/**
+	 * 
+	 * @return
+	 * @throws XMLException
+	 * @throws XMLStreamException
+	 * @throws XMLBadFormatException
+	 */
+	public XMLTag readXMLHeader() throws XMLStreamException, XMLBadFormatException
+	{
+		XMLTag result;
 
-        //
-        result = readTag();
+		//
+		result = readTag();
 
-        //
-        if (result == null)
-        {
-            throw new XMLBadFormatException("XML file ends prematurely, start document event is expected.");
-        }
-        else if (result.getType() != TagType.HEADER)
-        {
-            throw new XMLBadFormatException("XML header is missing.");
-        }
+		//
+		if (result == null)
+		{
+			throw new XMLBadFormatException("XML file ends prematurely, start document event is expected.");
+		}
+		else if (result.getType() != TagType.HEADER)
+		{
+			throw new XMLBadFormatException("XML header is missing.");
+		}
 
-        //
-        return result;
-    }
+		//
+		return result;
+	}
 
-    /**
-     * 
-     * @param args
-     * @throws Exception
-     */
-    public static void main(final String args[]) throws Exception
-    {
+	/**
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(final String args[]) throws Exception
+	{
 
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        XMLEventReader in = factory.createXMLEventReader(new FileReader("/home/cpm/C/Puck/Dev/Puck/test/TT/t3.puc"));
+		XMLInputFactory factory = XMLInputFactory.newInstance();
+		XMLEventReader in = factory.createXMLEventReader(new FileReader("/home/cpm/C/Puck/Dev/Puck/test/TT/t3.puc"));
 
-        XMLEvent event;
-        while (in.hasNext())
-        {
-            event = in.nextEvent();
+		XMLEvent event;
+		while (in.hasNext())
+		{
+			event = in.nextEvent();
 
-            switch (event.getEventType())
-            {
-                case XMLEvent.ATTRIBUTE:
-                    System.out.println("ATTRIBUTE ");
-                break;
-                case XMLEvent.CDATA:
-                    System.out.println("CDATA");
-                break;
-                case XMLEvent.CHARACTERS:
-                    System.out.println("CHARACTERS [" + event.asCharacters().getData() + "]");
-                break;
-                case XMLEvent.COMMENT:
-                    System.out.println("COMMENT");
-                break;
-                case XMLEvent.DTD:
-                    System.out.println("DTD");
-                break;
-                case XMLEvent.END_DOCUMENT:
-                    System.out.println("END_DOCUMENT");
-                break;
-                case XMLEvent.END_ELEMENT:
-                    System.out.println("END_ELEMENT " + event.asEndElement().getName());
-                break;
-                case XMLEvent.ENTITY_DECLARATION:
-                    System.out.println("ENTITY_DECLARATION");
-                break;
-                case XMLEvent.ENTITY_REFERENCE:
-                    System.out.println("ENTITY_REFERENCE");
-                break;
-                case XMLEvent.NAMESPACE:
-                    System.out.println("NAMESPACE");
-                break;
-                case XMLEvent.NOTATION_DECLARATION:
-                    System.out.println("NOTATION_DECLARATION");
-                break;
-                case XMLEvent.PROCESSING_INSTRUCTION:
-                    System.out.println("PROCESSING_INSTRUCTION");
-                break;
-                case XMLEvent.SPACE:
-                    System.out.println("SPACE");
-                break;
-                case XMLEvent.START_DOCUMENT:
-                    System.out.println("START_DOCUMENT");
-                break;
-                case XMLEvent.START_ELEMENT:
-                    System.out.println("START_ELEMENT [name=" + event.asStartElement().getName() + "][namespaceURI=" + event.asStartElement().getName().getNamespaceURI() + "][prefix="
-                            + event.asStartElement().getName().getPrefix() + "][localPart=" + event.asStartElement().getName().getLocalPart() + "]");
-                break;
-                default:
-                    System.out.println("DEFAULT");
-            }
-        }
-    }
+			switch (event.getEventType())
+			{
+				case XMLEvent.ATTRIBUTE:
+					System.out.println("ATTRIBUTE ");
+				break;
+				case XMLEvent.CDATA:
+					System.out.println("CDATA");
+				break;
+				case XMLEvent.CHARACTERS:
+					System.out.println("CHARACTERS [" + event.asCharacters().getData() + "]");
+				break;
+				case XMLEvent.COMMENT:
+					System.out.println("COMMENT");
+				break;
+				case XMLEvent.DTD:
+					System.out.println("DTD");
+				break;
+				case XMLEvent.END_DOCUMENT:
+					System.out.println("END_DOCUMENT");
+				break;
+				case XMLEvent.END_ELEMENT:
+					System.out.println("END_ELEMENT " + event.asEndElement().getName());
+				break;
+				case XMLEvent.ENTITY_DECLARATION:
+					System.out.println("ENTITY_DECLARATION");
+				break;
+				case XMLEvent.ENTITY_REFERENCE:
+					System.out.println("ENTITY_REFERENCE");
+				break;
+				case XMLEvent.NAMESPACE:
+					System.out.println("NAMESPACE");
+				break;
+				case XMLEvent.NOTATION_DECLARATION:
+					System.out.println("NOTATION_DECLARATION");
+				break;
+				case XMLEvent.PROCESSING_INSTRUCTION:
+					System.out.println("PROCESSING_INSTRUCTION");
+				break;
+				case XMLEvent.SPACE:
+					System.out.println("SPACE");
+				break;
+				case XMLEvent.START_DOCUMENT:
+					System.out.println("START_DOCUMENT");
+				break;
+				case XMLEvent.START_ELEMENT:
+					System.out.println("START_ELEMENT [name=" + event.asStartElement().getName() + "][namespaceURI=" + event.asStartElement().getName().getNamespaceURI() + "][prefix="
+							+ event.asStartElement().getName().getPrefix() + "][localPart=" + event.asStartElement().getName().getLocalPart() + "]");
+				break;
+				default:
+					System.out.println("DEFAULT");
+			}
+		}
+	}
 }