Refactored to better reuse the code moved to XmlHelper
Improved javadoc
Merge pull request #5 from jorgeb1980/development

Development