diff --git a/README.md b/README.md
index 472e884a..9e8d33d2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Projeto Para implementação do Java-Nfe Utilizando JAXB.
 ## Gostou do Projeto? Dê sua colaboração: [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TX9K693QQYA6W)
 
 Para Iniciar : 
-- Baixe o java-nfe-4.00.5.jar (https://github.com/Samuel-Oliveira/Java_NFe/raw/master/java-nfe-4.00.5b.jar) e o adicione às bibliotecas de Seu Projeto.
+- Baixe o java-nfe-4.00.5.jar (https://github.com/Samuel-Oliveira/Java_NFe/raw/master/java-nfe-4.00.5.jar) e o adicione às bibliotecas de Seu Projeto.
 - Baixe o Schemas.rar (https://github.com/Samuel-Oliveira/Java_NFe/raw/master/Schemas.rar) e extraia na sua Máquina.
 
 - Maven :
@@ -34,6 +34,8 @@ ________________________________________________________________________________
 - Alterado Urls Consulta NFce GO
 - Adicionado Schemas Versão v1_51
 - Adicionado Evento Epec
+- Atualizado Cacert
+- Atualizado Implementação para Ambiente Web
 - **Atenção: Atualizado Schemas faça o download Novamente.** 
 
 ## v4.00.4 - 10-05-2018
diff --git a/java-nfe-4.00.5.jar b/java-nfe-4.00.5.jar
new file mode 100644
index 00000000..56c159dc
Binary files /dev/null and b/java-nfe-4.00.5.jar differ
diff --git a/src/main/java/br/com/samuelweb/nfe/Assinar.java b/src/main/java/br/com/samuelweb/nfe/Assinar.java
index 3b0b3ae7..81a2ef71 100644
--- a/src/main/java/br/com/samuelweb/nfe/Assinar.java
+++ b/src/main/java/br/com/samuelweb/nfe/Assinar.java
@@ -1,31 +1,17 @@
 package br.com.samuelweb.nfe;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.UnrecoverableEntryException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import br.com.samuelweb.certificado.Certificado;
+import br.com.samuelweb.certificado.CertificadoService;
+import br.com.samuelweb.certificado.exception.CertificadoException;
+import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
+import br.com.samuelweb.nfe.exception.NfeException;
+import br.com.samuelweb.nfe.util.XmlUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignatureMethod;
-import javax.xml.crypto.dsig.SignedInfo;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureException;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
+import javax.xml.crypto.dsig.*;
 import javax.xml.crypto.dsig.dom.DOMSignContext;
 import javax.xml.crypto.dsig.keyinfo.KeyInfo;
 import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
@@ -39,17 +25,14 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import br.com.samuelweb.certificado.Certificado;
-import br.com.samuelweb.certificado.CertificadoService;
-import br.com.samuelweb.certificado.exception.CertificadoException;
-import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
-import br.com.samuelweb.nfe.exception.NfeException;
-import br.com.samuelweb.nfe.util.XmlUtil;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.*;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Classe Responsavel Por Assinar O Xml.
@@ -58,160 +41,156 @@
  */
 class Assinar {
 
-	static final String INFINUT = "infInut";
-	static final String EVENTO = "evento";
-
-	private static PrivateKey privateKey;
-
-	private static KeyInfo keyInfo;
-
-	Assinar assinarXMLsCertfificadoA1;
-
-	/**
-	 * @param stringXml
-	 * @param tipo
-	 *            ('NFe' para nfe normal , 'infInut' para inutilizacao, 'evento'
-	 *            para eventos)
-	 * @return String do Xml Assinado
-	 * @throws NfeException
-	 */
-	static String assinaNfe(ConfiguracoesNfe config, String stringXml, String tipo) throws NfeException {
-
-		stringXml = XmlUtil.removeAcentos(stringXml);
-		stringXml = assinaDocNFe(config, stringXml, tipo);
-
-		return stringXml;
-	}
-
-	/**
-	 * Assinatura do XML de Envio de Lote da NF-e utilizando Certificado Digital.
-	 *
-	 * @param Conteudo
-	 *            do Xml
-	 * @param Nome
-	 *            do Certificado Digital
-	 * @return String do XMl Assinado
-	 * @throws Exception
-	 */
-	private static String assinaDocNFe(ConfiguracoesNfe config, String xml, String tipo) throws NfeException {
-
-		try {
-			Document document = documentFactory(xml);
-			XMLSignatureFactory signatureFactory = XMLSignatureFactory.getInstance("DOM");
-			ArrayList<Transform> transformList = signatureFactory(signatureFactory);
-			loadCertificates(config, signatureFactory);
-
-			for (int i = 0; i < document.getDocumentElement().getElementsByTagName(tipo).getLength(); i++) {
-				assinarNFe(tipo, signatureFactory, transformList, privateKey, keyInfo, document, i);
-			}
-
-			return outputXML(document);
-		} catch (SAXException | IOException | ParserConfigurationException | NoSuchAlgorithmException
-				| InvalidAlgorithmParameterException | KeyStoreException | UnrecoverableEntryException
-				| NoSuchProviderException | CertificateException | CertificadoException | MarshalException
-				| XMLSignatureException e) {
-			throw new NfeException("Erro ao Assinar Nfe" + e.getMessage());
-		}
-	}
-
-	private static void assinarNFe(String tipo, XMLSignatureFactory fac, ArrayList<Transform> transformList,
-			PrivateKey privateKey, KeyInfo ki, Document document, int indexNFe) throws NoSuchAlgorithmException,
-			InvalidAlgorithmParameterException, MarshalException, XMLSignatureException {
-
-		NodeList elements;
-		switch (tipo) {
-		case EVENTO:
-			elements = document.getElementsByTagName("infEvento");
-			break;
-		case INFINUT:
-			elements = document.getElementsByTagName("infInut");
-			break;
-		default:
-			elements = document.getElementsByTagName("infNFe");
-		}
-
-		org.w3c.dom.Element el = (org.w3c.dom.Element) elements.item(indexNFe);
-		String id = el.getAttribute("Id");
-
-		el.setIdAttribute("Id", true);
-
-		Reference ref = fac.newReference("#" + id, fac.newDigestMethod(DigestMethod.SHA1, null), transformList, null,
-				null);
-
-		SignedInfo si = fac.newSignedInfo(
-				fac.newCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE, (C14NMethodParameterSpec) null),
-				fac.newSignatureMethod(SignatureMethod.RSA_SHA1, null), Collections.singletonList(ref));
-
-		XMLSignature signature = fac.newXMLSignature(si, ki);
-
-		DOMSignContext dsc;
-
-		if (tipo.equals(INFINUT)) {
-			dsc = new DOMSignContext(privateKey, document.getFirstChild());
-		} else {
-			dsc = new DOMSignContext(privateKey,
-					document.getDocumentElement().getElementsByTagName(tipo).item(indexNFe));
-		}
-
-		dsc.setBaseURI("ok");
-
-		signature.sign(dsc);
-	}
-
-	private static ArrayList<Transform> signatureFactory(XMLSignatureFactory signatureFactory)
-			throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
-
-		ArrayList<Transform> transformList = new ArrayList<Transform>();
-		TransformParameterSpec tps = null;
-		Transform envelopedTransform = signatureFactory.newTransform(Transform.ENVELOPED, tps);
-		Transform c14NTransform = signatureFactory.newTransform("http://www.w3.org/TR/2001/REC-xml-c14n-20010315", tps);
-
-		transformList.add(envelopedTransform);
-		transformList.add(c14NTransform);
-		return transformList;
-	}
-
-	private static Document documentFactory(String xml) throws SAXException, IOException, ParserConfigurationException {
-
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		return factory.newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
-	}
-
-	private static void loadCertificates(ConfiguracoesNfe config, XMLSignatureFactory signatureFactory)
-			throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableEntryException, NoSuchProviderException,
-			CertificateException, IOException, CertificadoException {
-
-		Certificado certificado = config.getCertificado();
-		KeyStore keyStore = CertificadoService.getKeyStore(certificado);
-
-		KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry) keyStore.getEntry(certificado.getNome(),
-				new KeyStore.PasswordProtection(certificado.getSenha().toCharArray()));
-		privateKey = pkEntry.getPrivateKey();
-
-		KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
-		List<X509Certificate> x509Content = new ArrayList<X509Certificate>();
-
-		x509Content.add(CertificadoService.getCertificate(certificado, keyStore));
-		X509Data x509Data = keyInfoFactory.newX509Data(x509Content);
-		keyInfo = keyInfoFactory.newKeyInfo(Collections.singletonList(x509Data));
-	}
-
-	private static String outputXML(Document doc) throws NfeException {
-
-		try {
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
-			TransformerFactory tf = TransformerFactory.newInstance();
-			Transformer trans = tf.newTransformer();
-			trans.transform(new DOMSource(doc), new StreamResult(os));
-			String xml = os.toString();
-			xml = xml.replaceAll("\\r\\n", "");
-			xml = xml.replaceAll(" standalone=\"no\"", "");
-			return xml;
-		} catch (TransformerException e) {
-			throw new NfeException("Erro ao Transformar Documento:" + e.getMessage());
-		}
-
-	}
+    static final String INFINUT = "infInut";
+    static final String EVENTO = "evento";
+
+    private static PrivateKey privateKey;
+
+    private static KeyInfo keyInfo;
+
+    Assinar assinarXMLsCertfificadoA1;
+
+    /**
+     * @param stringXml
+     * @param tipo      ('NFe' para nfe normal , 'infInut' para inutilizacao, 'evento'
+     *                  para eventos)
+     * @return String do Xml Assinado
+     * @throws NfeException
+     */
+    static String assinaNfe(ConfiguracoesNfe config, String stringXml, String tipo) throws NfeException {
+
+        stringXml = XmlUtil.removeAcentos(stringXml);
+        stringXml = assinaDocNFe(config, stringXml, tipo);
+
+        return stringXml;
+    }
+
+    /**
+     * Assinatura do XML de Envio de Lote da NF-e utilizando Certificado Digital.
+     *
+     * @param Conteudo do Xml
+     * @param Nome     do Certificado Digital
+     * @return String do XMl Assinado
+     * @throws Exception
+     */
+    private static String assinaDocNFe(ConfiguracoesNfe config, String xml, String tipo) throws NfeException {
+
+        try {
+            Document document = documentFactory(xml);
+            XMLSignatureFactory signatureFactory = XMLSignatureFactory.getInstance("DOM");
+            ArrayList<Transform> transformList = signatureFactory(signatureFactory);
+            loadCertificates(config, signatureFactory);
+
+            for (int i = 0; i < document.getDocumentElement().getElementsByTagName(tipo).getLength(); i++) {
+                assinarNFe(tipo, signatureFactory, transformList, privateKey, keyInfo, document, i);
+            }
+
+            return outputXML(document);
+        } catch (SAXException | IOException | ParserConfigurationException | NoSuchAlgorithmException
+                | InvalidAlgorithmParameterException | KeyStoreException | UnrecoverableEntryException
+                | CertificadoException | MarshalException
+                | XMLSignatureException e) {
+            throw new NfeException("Erro ao Assinar Nfe" + e.getMessage());
+        }
+    }
+
+    private static void assinarNFe(String tipo, XMLSignatureFactory fac, ArrayList<Transform> transformList,
+                                   PrivateKey privateKey, KeyInfo ki, Document document, int indexNFe) throws NoSuchAlgorithmException,
+            InvalidAlgorithmParameterException, MarshalException, XMLSignatureException {
+
+        NodeList elements;
+        switch (tipo) {
+            case EVENTO:
+                elements = document.getElementsByTagName("infEvento");
+                break;
+            case INFINUT:
+                elements = document.getElementsByTagName("infInut");
+                break;
+            default:
+                elements = document.getElementsByTagName("infNFe");
+        }
+
+        org.w3c.dom.Element el = (org.w3c.dom.Element) elements.item(indexNFe);
+        String id = el.getAttribute("Id");
+
+        el.setIdAttribute("Id", true);
+
+        Reference ref = fac.newReference("#" + id, fac.newDigestMethod(DigestMethod.SHA1, null), transformList, null,
+                null);
+
+        SignedInfo si = fac.newSignedInfo(
+                fac.newCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE, (C14NMethodParameterSpec) null),
+                fac.newSignatureMethod(SignatureMethod.RSA_SHA1, null), Collections.singletonList(ref));
+
+        XMLSignature signature = fac.newXMLSignature(si, ki);
+
+        DOMSignContext dsc;
+
+        if (tipo.equals(INFINUT)) {
+            dsc = new DOMSignContext(privateKey, document.getFirstChild());
+        } else {
+            dsc = new DOMSignContext(privateKey,
+                    document.getDocumentElement().getElementsByTagName(tipo).item(indexNFe));
+        }
+
+        dsc.setBaseURI("ok");
+
+        signature.sign(dsc);
+    }
+
+    private static ArrayList<Transform> signatureFactory(XMLSignatureFactory signatureFactory)
+            throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+
+        ArrayList<Transform> transformList = new ArrayList<Transform>();
+        TransformParameterSpec tps = null;
+        Transform envelopedTransform = signatureFactory.newTransform(Transform.ENVELOPED, tps);
+        Transform c14NTransform = signatureFactory.newTransform("http://www.w3.org/TR/2001/REC-xml-c14n-20010315", tps);
+
+        transformList.add(envelopedTransform);
+        transformList.add(c14NTransform);
+        return transformList;
+    }
+
+    private static Document documentFactory(String xml) throws SAXException, IOException, ParserConfigurationException {
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        return factory.newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
+    }
+
+    private static void loadCertificates(ConfiguracoesNfe config, XMLSignatureFactory signatureFactory)
+            throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableEntryException, CertificadoException {
+
+        Certificado certificado = config.getCertificado();
+        KeyStore keyStore = CertificadoService.getKeyStore(certificado);
+
+        KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry) keyStore.getEntry(certificado.getNome(),
+                new KeyStore.PasswordProtection(certificado.getSenha().toCharArray()));
+        privateKey = pkEntry.getPrivateKey();
+
+        KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
+        List<X509Certificate> x509Content = new ArrayList<X509Certificate>();
+
+        x509Content.add(CertificadoService.getCertificate(certificado, keyStore));
+        X509Data x509Data = keyInfoFactory.newX509Data(x509Content);
+        keyInfo = keyInfoFactory.newKeyInfo(Collections.singletonList(x509Data));
+    }
+
+    private static String outputXML(Document doc) throws NfeException {
+
+        try {
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer trans = tf.newTransformer();
+            trans.transform(new DOMSource(doc), new StreamResult(os));
+            String xml = os.toString();
+            xml = xml.replaceAll("\\r\\n", "");
+            xml = xml.replaceAll(" standalone=\"no\"", "");
+            return xml;
+        } catch (TransformerException e) {
+            throw new NfeException("Erro ao Transformar Documento:" + e.getMessage());
+        }
+
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/br/com/samuelweb/nfe/Epec.java b/src/main/java/br/com/samuelweb/nfe/Epec.java
index 6608703c..9239fbaf 100644
--- a/src/main/java/br/com/samuelweb/nfe/Epec.java
+++ b/src/main/java/br/com/samuelweb/nfe/Epec.java
@@ -1,5 +1,6 @@
 package br.com.samuelweb.nfe;
 
+import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
 import br.com.samuelweb.nfe.exception.NfeException;
 import br.com.samuelweb.nfe.util.ConstantesUtil;
 import br.com.samuelweb.nfe.util.XmlUtil;
@@ -14,7 +15,7 @@
  */
 class Epec {
 
-    static TRetEnvEvento eventoEpec(TEnvEvento enviEvento, boolean valida, String tipo) throws NfeException {
+    static TRetEnvEvento eventoEpec(ConfiguracoesNfe config, TEnvEvento enviEvento, boolean valida, String tipo) throws NfeException {
 
         try {
 
@@ -22,7 +23,7 @@ static TRetEnvEvento eventoEpec(TEnvEvento enviEvento, boolean valida, String ti
             xml = xml.replaceAll(" xmlns:ns2=\"http://www.w3.org/2000/09/xmldsig#\"", "");
             xml = xml.replaceAll("<evento v", "<evento xmlns=\"http://www.portalfiscal.inf.br/nfe\" v");
 
-            xml = Eventos.enviarEvento(xml, ConstantesUtil.EVENTO.EPEC, valida, tipo);
+            xml = Eventos.enviarEvento(config, xml, ConstantesUtil.EVENTO.EPEC, valida, tipo);
 
             return XmlUtil.xmlToObject(xml, TRetEnvEvento.class);
 
diff --git a/src/main/java/br/com/samuelweb/nfe/Eventos.java b/src/main/java/br/com/samuelweb/nfe/Eventos.java
index 85f5229f..4ae2eb39 100644
--- a/src/main/java/br/com/samuelweb/nfe/Eventos.java
+++ b/src/main/java/br/com/samuelweb/nfe/Eventos.java
@@ -1,13 +1,5 @@
 package br.com.samuelweb.nfe;
 
-import java.rmi.RemoteException;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
-
 import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
 import br.com.samuelweb.nfe.exception.NfeException;
 import br.com.samuelweb.nfe.exception.NfeValidacaoException;
@@ -15,68 +7,75 @@
 import br.com.samuelweb.nfe.util.ObjetoUtil;
 import br.com.samuelweb.nfe.util.WebServiceUtil;
 import br.inf.portalfiscal.www.nfe_400.wsdl.NFeRecepcaoEvento.NFeRecepcaoEvento4Stub;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.AXIOMUtil;
+import org.apache.axis2.transport.http.HTTPConstants;
 
-class Eventos {
-
-	static String enviarEvento(ConfiguracoesNfe config, String xml, String tipoEvento, boolean valida, String tipo)
-			throws NfeException {
-
-		try {
-
-			xml = Assinar.assinaNfe(config, xml, Assinar.EVENTO);
-
-			if (valida) {
-				String erros = "";
-				switch (tipoEvento) {
-				case ConstantesUtil.EVENTO.CANCELAR:
-					erros = Validar.validaXml(config, xml, Validar.CANCELAR);
-					break;
-				case ConstantesUtil.EVENTO.CCE:
-					erros = Validar.validaXml(config, xml, Validar.CCE);
-					break;
-        case ConstantesUtil.EVENTO.EPEC:
-          erros = Validar.validaXml(xml, Validar.CCE);
-          break;
-				case ConstantesUtil.EVENTO.MANIFESTACAO:
-					erros = Validar.validaXml(config, xml, Validar.MANIFESTAR);
-					break;
-				default:
-					break;
-				}
-
-				if (!ObjetoUtil.isEmpty(erros)) {
-					throw new NfeValidacaoException("Erro Na Validação do Xml: " + erros);
-				}
-			}
-
-			if (config.isLog()) {
-				System.out.println("Xml Evento: " + xml);
-			}
-
-			OMElement ome = AXIOMUtil.stringToOM(xml);
-
-			NFeRecepcaoEvento4Stub.NfeDadosMsg dadosMsg = new NFeRecepcaoEvento4Stub.NfeDadosMsg();
-			dadosMsg.setExtraElement(ome);
-
-			String url;
-			if (tipoEvento.equals(ConstantesUtil.EVENTO.MANIFESTACAO)) {
-				url = WebServiceUtil.getUrl(config, ConstantesUtil.NFE, ConstantesUtil.SERVICOS.MANIFESTACAO);
-			} else {
-				url = WebServiceUtil.getUrl(config, tipo, ConstantesUtil.SERVICOS.EVENTO);
-			}
-
-			NFeRecepcaoEvento4Stub stub = new NFeRecepcaoEvento4Stub(url);
-			// Timeout
-			if (!ObjetoUtil.isEmpty(config.getTimeout())) {
-				stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, config.getTimeout());
-				stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,
-						config.getTimeout());
-			}
-			NFeRecepcaoEvento4Stub.NfeResultMsg result = stub.nfeRecepcaoEvento(dadosMsg);
+import javax.xml.stream.XMLStreamException;
+import java.rmi.RemoteException;
 
-			return result.getExtraElement().toString();
-		} catch (RemoteException | XMLStreamException e) {
-			throw new NfeException(e.getMessage());
-		}
+class Eventos {
 
-	}}
\ No newline at end of file
+    static String enviarEvento(ConfiguracoesNfe config, String xml, String tipoEvento, boolean valida, String tipo)
+            throws NfeException {
+
+        try {
+
+            xml = Assinar.assinaNfe(config, xml, Assinar.EVENTO);
+
+            if (valida) {
+                String erros = "";
+                switch (tipoEvento) {
+                    case ConstantesUtil.EVENTO.CANCELAR:
+                        erros = Validar.validaXml(config, xml, Validar.CANCELAR);
+                        break;
+                    case ConstantesUtil.EVENTO.CCE:
+                        erros = Validar.validaXml(config, xml, Validar.CCE);
+                        break;
+                    case ConstantesUtil.EVENTO.EPEC:
+                        erros = Validar.validaXml(config, xml, Validar.CCE);
+                        break;
+                    case ConstantesUtil.EVENTO.MANIFESTACAO:
+                        erros = Validar.validaXml(config, xml, Validar.MANIFESTAR);
+                        break;
+                    default:
+                        break;
+                }
+
+                if (!ObjetoUtil.isEmpty(erros)) {
+                    throw new NfeValidacaoException("Erro Na Validação do Xml: " + erros);
+                }
+            }
+
+            if (config.isLog()) {
+                System.out.println("Xml Evento: " + xml);
+            }
+
+            OMElement ome = AXIOMUtil.stringToOM(xml);
+
+            NFeRecepcaoEvento4Stub.NfeDadosMsg dadosMsg = new NFeRecepcaoEvento4Stub.NfeDadosMsg();
+            dadosMsg.setExtraElement(ome);
+
+            String url;
+            if (tipoEvento.equals(ConstantesUtil.EVENTO.MANIFESTACAO)) {
+                url = WebServiceUtil.getUrl(config, ConstantesUtil.NFE, ConstantesUtil.SERVICOS.MANIFESTACAO);
+            } else {
+                url = WebServiceUtil.getUrl(config, tipo, ConstantesUtil.SERVICOS.EVENTO);
+            }
+
+            NFeRecepcaoEvento4Stub stub = new NFeRecepcaoEvento4Stub(url);
+            // Timeout
+            if (!ObjetoUtil.isEmpty(config.getTimeout())) {
+                stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, config.getTimeout());
+                stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,
+                        config.getTimeout());
+            }
+            NFeRecepcaoEvento4Stub.NfeResultMsg result = stub.nfeRecepcaoEvento(dadosMsg);
+
+            return result.getExtraElement().toString();
+        } catch (RemoteException | XMLStreamException e) {
+            throw new NfeException(e.getMessage());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/br/com/samuelweb/nfe/Inutilizar.java b/src/main/java/br/com/samuelweb/nfe/Inutilizar.java
index f36457e4..08d6c09e 100644
--- a/src/main/java/br/com/samuelweb/nfe/Inutilizar.java
+++ b/src/main/java/br/com/samuelweb/nfe/Inutilizar.java
@@ -1,14 +1,5 @@
 package br.com.samuelweb.nfe;
 
-import java.rmi.RemoteException;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
-
 import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
 import br.com.samuelweb.nfe.exception.NfeException;
 import br.com.samuelweb.nfe.exception.NfeValidacaoException;
@@ -19,6 +10,13 @@
 import br.inf.portalfiscal.nfe.schema_4.inutNFe.TInutNFe;
 import br.inf.portalfiscal.nfe.schema_4.inutNFe.TRetInutNFe;
 import br.inf.portalfiscal.www.nfe_400.wsdl.NFeInutilizacao.NFeInutilizacao4Stub;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.AXIOMUtil;
+import org.apache.axis2.transport.http.HTTPConstants;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamException;
+import java.rmi.RemoteException;
 
 /**
  * Classe Responsavel por inutilizar uma Faixa de numeracao da Nfe.
@@ -27,8 +25,7 @@
  */
 class Inutilizar {
 
-	static TInutNFe criaObjetoInutiliza(ConfiguracoesNfe config, String id, String motivo, String tipo)
-			throws NfeException {
+    static TInutNFe criaObjetoInutiliza(ConfiguracoesNfe config, String id, String motivo, String tipo) {
 
 		TInutNFe inutNFe = new TInutNFe();
 		inutNFe.setVersao(ConstantesUtil.VERSAO.INUTILIZACAO);
diff --git a/src/main/java/br/com/samuelweb/nfe/Nfe.java b/src/main/java/br/com/samuelweb/nfe/Nfe.java
index e4a8ac38..d05f2480 100644
--- a/src/main/java/br/com/samuelweb/nfe/Nfe.java
+++ b/src/main/java/br/com/samuelweb/nfe/Nfe.java
@@ -3,8 +3,6 @@
  */
 package br.com.samuelweb.nfe;
 
-import javax.xml.bind.JAXBException;
-
 import br.com.samuelweb.nfe.dom.Enum.TipoManifestacao;
 import br.com.samuelweb.nfe.exception.NfeException;
 import br.com.samuelweb.nfe.util.CertificadoUtil;
@@ -22,6 +20,8 @@
 import br.inf.portalfiscal.nfe.schema_4.retConsSitNFe.TRetConsSitNFe;
 import br.inf.portalfiscal.nfe.schema_4.retConsStatServ.TRetConsStatServ;
 
+import javax.xml.bind.JAXBException;
+
 /**
  * @author Samuel Oliveira - samuk.exe@hotmail.com - www.samuelweb.com.br
  */
@@ -156,20 +156,6 @@ public static TInutNFe criaObjetoInutilizacao(String id, String motivo, String t
 
 	}
 
-	/**
-	 * Metodo para Montar a NFE.
-	 *
-	 * @param enviNFe
-	 * @param valida
-	 * @return
-	 * @throws NfeException
-	 */
-	public static TEnviNFe montaNfe(TEnviNFe enviNFe, boolean valida) throws NfeException {
-
-		return Enviar.montaNfe(CertificadoUtil.iniciaConfiguracoes(), enviNFe, valida);
-
-	}
-
     /**
      * Metodo para Montar a NFE.
      *
@@ -180,81 +166,7 @@ public static TEnviNFe montaNfe(TEnviNFe enviNFe, boolean valida) throws NfeExce
      */
     public static TEnviNFe montaNfe(TEnviNFe enviNFe, boolean valida) throws NfeException {
 
-        return Enviar.montaNfe(enviNFe, valida);
-
-    }
-
-    /**
-     * Metodo para Enviar a NFE.
-     * No tipo Informar ConstantesUtil.NFE ou ConstantesUtil.NFCE
-     *
-     * @param enviNFe
-     * @param tipo
-     * @return
-     * @throws NfeException
-     */
-    public static TRetEnviNFe enviarNfe(TEnviNFe enviNFe, String tipo) throws NfeException {
-
-        return Enviar.enviaNfe(enviNFe, tipo);
-
-    }
-
-    /**
-     * * Metodo para Cancelar a NFE.
-     * No tipo Informar ConstantesUtil.NFE ou ConstantesUtil.NFCE
-     *
-     * @param envEvento
-     * @return
-     * @throws NfeException
-     */
-    public static TRetEnvEvento cancelarNfe(TEnvEvento envEvento, boolean valida, String tipo) throws NfeException {
-
-        return Cancelar.eventoCancelamento(envEvento, valida, tipo);
-
-    }
-
-
-    /**
-     * * Metodo para Enviar o EPEC.
-     * No tipo Informar ConstantesUtil.NFE ou ConstantesUtil.NFCE
-     *
-     * @param envEvento
-     * @return
-     * @throws NfeException
-     */
-    public static br.inf.portalfiscal.nfe.schema.envEpec.TRetEnvEvento enviarEpec(br.inf.portalfiscal.nfe.schema.envEpec.TEnvEvento envEvento, boolean valida, String tipo) throws NfeException {
-
-        return Epec.eventoEpec(envEvento, valida, tipo);
-
-    }
-
-   /**
-     * * Metodo para Envio da Carta De Correção da NFE.
-     * No tipo Informar ConstantesUtil.NFE ou ConstantesUtil.NFCE
-     *
-     * @param evento
-     * @param valida
-     * @param tipo
-     * @return
-     * @throws NfeException
-     */
-    public static br.inf.portalfiscal.nfe.schema.envcce.TRetEnvEvento cce(br.inf.portalfiscal.nfe.schema.envcce.TEnvEvento evento, boolean valida, String tipo) throws NfeException {
-
-        return CartaCorrecao.eventoCCe(evento, valida, tipo);
-
-    }
-
-    /**
-     * Metodo para Manifestação da NFE.
-     *
-     * @param envEvento
-     * @param valida
-     * @return
-     * @throws NfeException
-     */
-    public static br.inf.portalfiscal.nfe.schema.envConfRecebto.TRetEnvEvento manifestacao(String chave, TipoManifestacao manifestacao, String cnpj, String motivo, String data) throws NfeException {
-
-        return ManifestacaoDestinatario.eventoManifestacao(chave, manifestacao, cnpj, data, motivo);
+        return Enviar.montaNfe(CertificadoUtil.iniciaConfiguracoes(), enviNFe, valida);
 
     }
 
diff --git a/src/main/java/br/com/samuelweb/nfe/NfeWeb.java b/src/main/java/br/com/samuelweb/nfe/NfeWeb.java
index 79f41a28..7ef9a58f 100644
--- a/src/main/java/br/com/samuelweb/nfe/NfeWeb.java
+++ b/src/main/java/br/com/samuelweb/nfe/NfeWeb.java
@@ -3,8 +3,6 @@
  */
 package br.com.samuelweb.nfe;
 
-import javax.xml.bind.JAXBException;
-
 import br.com.samuelweb.nfe.dom.ConfiguracoesWebNfe;
 import br.com.samuelweb.nfe.dom.Enum.TipoManifestacao;
 import br.com.samuelweb.nfe.exception.NfeException;
@@ -22,6 +20,8 @@
 import br.inf.portalfiscal.nfe.schema_4.retConsSitNFe.TRetConsSitNFe;
 import br.inf.portalfiscal.nfe.schema_4.retConsStatServ.TRetConsStatServ;
 
+import javax.xml.bind.JAXBException;
+
 /**
  * @author Samuel Oliveira - samuk.exe@hotmail.com - www.samuelweb.com.br
  */
@@ -234,4 +234,18 @@ public static br.inf.portalfiscal.nfe.schema.envConfRecebto.TRetEnvEvento manife
 
 	}
 
+    /**
+     * * Metodo para Enviar o EPEC.
+     * No tipo Informar ConstantesUtil.NFE ou ConstantesUtil.NFCE
+     *
+     * @param envEvento
+     * @return
+     * @throws NfeException
+     */
+    public static br.inf.portalfiscal.nfe.schema.envEpec.TRetEnvEvento enviarEpec(ConfiguracoesWebNfe config, br.inf.portalfiscal.nfe.schema.envEpec.TEnvEvento envEvento, boolean valida, String tipo) throws NfeException {
+
+        return Epec.eventoEpec(config, envEvento, valida, tipo);
+
+    }
+
 }
diff --git a/src/main/java/br/com/samuelweb/nfe/Validar.java b/src/main/java/br/com/samuelweb/nfe/Validar.java
index a9ac91ba..84972caf 100644
--- a/src/main/java/br/com/samuelweb/nfe/Validar.java
+++ b/src/main/java/br/com/samuelweb/nfe/Validar.java
@@ -1,175 +1,165 @@
 package br.com.samuelweb.nfe;
 
-import br.com.samuelweb.nfe.dom.ConfiguracoesIniciaisNfe;
+import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
 import br.com.samuelweb.nfe.exception.NfeException;
 import br.com.samuelweb.nfe.util.SchemaUtil;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
-import java.io.ByteArrayInputStream;
-import java.io.File;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
 
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+class Validar implements ErrorHandler {
 
-import br.com.samuelweb.nfe.dom.ConfiguracoesNfe;
-import br.com.samuelweb.nfe.exception.NfeException;
-import br.com.samuelweb.nfe.util.SchemaUtil;
+    static final String STATUS = "status";
+    static final String CONSULTA_XML = "consultaXml";
+    static final String CONSULTA_CADASTRO = "br/inf/portalfiscal/nfe/schema/consCad";
+    static final String ENVIO = "envio";
+    static final String DIST_DFE = "destDfe";
+    static final String INUTILIZACAO = "inutilizacao";
+    static final String CANCELAR = "cancelar";
+    static final String MANIFESTAR = "manifestar";
+    static final String CCE = "br/inf/portalfiscal/nfe/schema/cce";
+    static final String EPEC = "epec";
+    static final String CONSULTA_RECIBO = "consultaRecibo";
+    private static String xsd;
+    private String listaComErrosDeValidacao;
 
-class Validar implements ErrorHandler {
+    /**
+     * Construtor privado
+     */
+    private Validar() {
+        this.listaComErrosDeValidacao = "";
+    }
 
-	private static String xsd;
+    static String validaXml(ConfiguracoesNfe config, String xml, String tipo) throws NfeException {
 
-	private String listaComErrosDeValidacao;
+        String errosValidacao;
 
-	static final String STATUS = "status";
-	static final String CONSULTA_XML = "consultaXml";
-	static final String CONSULTA_CADASTRO = "br/inf/portalfiscal/nfe/schema/consCad";
-	static final String ENVIO = "envio";
-	static final String DIST_DFE = "destDfe";
-	static final String INUTILIZACAO = "inutilizacao";
-	static final String CANCELAR = "cancelar";
-    static final String EPEC = "epec";
-	static final String MANIFESTAR = "manifestar";
-	static final String CCE = "br/inf/portalfiscal/nfe/schema/cce";
-	static final String CONSULTA_RECIBO = "consultaRecibo";
-
-	/**
-	 * Construtor privado
-	 */
-	private Validar() {
-		this.listaComErrosDeValidacao = "";
-	}
-
-	static String validaXml(ConfiguracoesNfe config, String xml, String tipo) throws NfeException {
-
-		String errosValidacao = null;
-
-		switch (tipo) {
-		case STATUS:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.STATUS;
-			break;
-		case ENVIO:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.ENVIO;
-			break;
-		case CONSULTA_XML:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_XML;
-			break;
-		case CONSULTA_CADASTRO:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_CADASTRO;
-			break;
-		case DIST_DFE:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.DIST_DFE;
-			break;
-		case INUTILIZACAO:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.INUTILIZACAO;
-			break;
-		case CANCELAR:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.CANCELAR;
-			break;
+        switch (tipo) {
+            case STATUS:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.STATUS;
+                break;
+            case ENVIO:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.ENVIO;
+                break;
+            case CONSULTA_XML:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_XML;
+                break;
+            case CONSULTA_CADASTRO:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_CADASTRO;
+                break;
+            case DIST_DFE:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.DIST_DFE;
+                break;
+            case INUTILIZACAO:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.INUTILIZACAO;
+                break;
+            case CANCELAR:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.CANCELAR;
+                break;
             case EPEC:
-                xsd = configuracoesNfe.getPastaSchemas() + "/" + SchemaUtil.EPEC;
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.EPEC;
+                break;
+            case CCE:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.CCE;
+                break;
+            case MANIFESTAR:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.MANIFESTAR;
+                break;
+            case CONSULTA_RECIBO:
+                xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_RECIBO;
+                break;
+            default:
                 break;
-		case CCE:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.CCE;
-			break;
-		case MANIFESTAR:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.MANIFESTAR;
-			break;
-		case CONSULTA_RECIBO:
-			xsd = config.getPastaSchemas() + "/" + SchemaUtil.CONSULTA_RECIBO;
-			break;
-		default:
-			break;
-		}
-
-		if (!new File(xsd).exists()) {
-			throw new NfeException("Schema Nfe não Localizado: " + xsd);
-		}
-
-		Validar validar = new Validar();
-
-		errosValidacao = validar.validateXml(xml, xsd);
-
-		return errosValidacao;
-	}
-
-	private String validateXml(String xml, String xsd) throws NfeException {
-
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		factory.setValidating(true);
-		factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
-				"http://www.w3.org/2001/XMLSchema");
-		factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", xsd);
-		DocumentBuilder builder;
-		try {
-			builder = factory.newDocumentBuilder();
-			builder.setErrorHandler(this);
-		} catch (ParserConfigurationException ex) {
-			throw new NfeException(ex.getMessage());
-		}
-
-		try {
-			builder.parse(new ByteArrayInputStream(xml.getBytes()));
-		} catch (Exception ex) {
-			throw new NfeException(ex.toString());
-		}
-
-		return this.getListaComErrosDeValidacao();
-	}
+        }
+
+        if (!new File(xsd).exists()) {
+            throw new NfeException("Schema Nfe não Localizado: " + xsd);
+        }
+
+        Validar validar = new Validar();
+
+        errosValidacao = validar.validateXml(xml, xsd);
+
+        return errosValidacao;
+    }
+
+    private String validateXml(String xml, String xsd) throws NfeException {
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        factory.setValidating(true);
+        factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
+                "http://www.w3.org/2001/XMLSchema");
+        factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", xsd);
+        DocumentBuilder builder;
+        try {
+            builder = factory.newDocumentBuilder();
+            builder.setErrorHandler(this);
+        } catch (ParserConfigurationException ex) {
+            throw new NfeException(ex.getMessage());
+        }
+
+        try {
+            builder.parse(new ByteArrayInputStream(xml.getBytes()));
+        } catch (Exception ex) {
+            throw new NfeException(ex.toString());
+        }
+
+        return this.getListaComErrosDeValidacao();
+    }
 
     public void error(SAXParseException exception) {
 
-		if (isError(exception)) {
-			listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
-		}
-	}
+        if (isError(exception)) {
+            listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
+        }
+    }
 
     public void fatalError(SAXParseException exception) {
 
-		listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
-	}
+        listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
+    }
 
     public void warning(SAXParseException exception) {
 
-		listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
-	}
-
-	private String tratamentoRetorno(String message) {
-
-		message = message.replaceAll("cvc-type.3.1.3:", "-");
-		message = message.replaceAll("cvc-attribute.3:", "-");
-		message = message.replaceAll("cvc-complex-type.2.4.a:", "-");
-		message = message.replaceAll("cvc-complex-type.2.4.b:", "-");
-		message = message.replaceAll("The value", "O valor");
-		message = message.replaceAll("of element", "do campo");
-		message = message.replaceAll("is not valid", "nao é valido");
-		message = message.replaceAll("Invalid content was found starting with element", "Encontrado o campo");
-		message = message.replaceAll("One of", "Campo(s)");
-		message = message.replaceAll("is expected", "é obrigatorio");
-		message = message.replaceAll("\\{", "");
-		message = message.replaceAll("\\}", "");
-		message = message.replaceAll("\"", "");
-		message = message.replaceAll("http://www.portalfiscal.inf.br/nfe:", "");
-		return System.getProperty("line.separator") + message.trim();
-	}
-
-	private String getListaComErrosDeValidacao() {
-
-		return listaComErrosDeValidacao;
-	}
-
-	private boolean isError(SAXParseException exception) {
-
-		return !exception.getMessage().startsWith("cvc-enumeration-valid")
-				&& !exception.getMessage().startsWith("cvc-pattern-valid")
-				&& !exception.getMessage().startsWith("cvc-maxLength-valid")
-				&& !exception.getMessage().startsWith("cvc-datatype");
-	}
+        listaComErrosDeValidacao += tratamentoRetorno(exception.getMessage());
+    }
+
+    private String tratamentoRetorno(String message) {
+
+        message = message.replaceAll("cvc-type.3.1.3:", "-");
+        message = message.replaceAll("cvc-attribute.3:", "-");
+        message = message.replaceAll("cvc-complex-type.2.4.a:", "-");
+        message = message.replaceAll("cvc-complex-type.2.4.b:", "-");
+        message = message.replaceAll("The value", "O valor");
+        message = message.replaceAll("of element", "do campo");
+        message = message.replaceAll("is not valid", "nao é valido");
+        message = message.replaceAll("Invalid content was found starting with element", "Encontrado o campo");
+        message = message.replaceAll("One of", "Campo(s)");
+        message = message.replaceAll("is expected", "é obrigatorio");
+        message = message.replaceAll("\\{", "");
+        message = message.replaceAll("\\}", "");
+        message = message.replaceAll("\"", "");
+        message = message.replaceAll("http://www.portalfiscal.inf.br/nfe:", "");
+        return System.getProperty("line.separator") + message.trim();
+    }
+
+    private String getListaComErrosDeValidacao() {
+
+        return listaComErrosDeValidacao;
+    }
+
+    private boolean isError(SAXParseException exception) {
+
+        return !exception.getMessage().startsWith("cvc-enumeration-valid")
+                && !exception.getMessage().startsWith("cvc-pattern-valid")
+                && !exception.getMessage().startsWith("cvc-maxLength-valid")
+                && !exception.getMessage().startsWith("cvc-datatype");
+    }
 
 }
diff --git a/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesIniciaisNfe.java b/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesIniciaisNfe.java
index d053c9c5..0ee8d691 100644
--- a/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesIniciaisNfe.java
+++ b/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesIniciaisNfe.java
@@ -46,7 +46,7 @@ private ConfiguracoesIniciaisNfe(Estados estado, String ambiente, Certificado ce
 	public static ConfiguracoesIniciaisNfe iniciaConfiguracoes(Estados estado, String ambiente, Certificado certificado,
 			String pastaSchemas) {
 		new ConfiguracoesIniciaisNfe(estado, ambiente, certificado, pastaSchemas);
-		System.out.println("Api Java Nfe Versão 4.00.4 - Samuel Olivera - samuk.exe@hotmail.com");
+        System.out.println("Api Java Nfe Versão 4.00.5 - Samuel Olivera - samuk.exe@hotmail.com");
 		System.out.println("Certificado: " + certificado.getTipo().toUpperCase() + " - "
 				+ certificado.getNome().toUpperCase() + " - Vencimento: " + certificado.getVencimento());
 		System.out.println(
@@ -58,7 +58,7 @@ public static ConfiguracoesIniciaisNfe iniciaConfiguracoes(Estados estado, Strin
 			String pastaSchemas, Boolean log) {
 		new ConfiguracoesIniciaisNfe(estado, ambiente, certificado, pastaSchemas);
 		if (log) {
-			System.out.println("Api Java Nfe Versão 4.00.4 - Samuel Olivera - samuk.exe@hotmail.com");
+            System.out.println("Api Java Nfe Versão 4.00.5 - Samuel Olivera - samuk.exe@hotmail.com");
 			System.out.println("Certificado: " + certificado.getTipo().toUpperCase() + " - "
 					+ certificado.getNome().toUpperCase() + " - Vencimento: " + certificado.getVencimento());
 			System.out.println("Ambiente: " + (ambiente.equals("1") ? "Produção" : "Homologação") + " - Estado: "
diff --git a/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesWebNfe.java b/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesWebNfe.java
index 9c1bdd90..f8a1942a 100644
--- a/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesWebNfe.java
+++ b/src/main/java/br/com/samuelweb/nfe/dom/ConfiguracoesWebNfe.java
@@ -34,8 +34,8 @@ public static ConfiguracoesWebNfe iniciaConfiguracoes(Estados estado, String amb
 		return iniciaConfiguracoes(estado, ambiente, certificado, pastaSchemas, true);
 	}
 
-	public static ConfiguracoesWebNfe iniciaConfiguracoes(Estados estado, String ambiente, Certificado certificado,
-			String pastaSchemas, Boolean log) {
+    private static ConfiguracoesWebNfe iniciaConfiguracoes(Estados estado, String ambiente, Certificado certificado,
+                                                           String pastaSchemas, Boolean log) {
 		ConfiguracoesWebNfe instance = new ConfiguracoesWebNfe();
 		instance.setEstado(estado);
 		instance.setAmbiente(ambiente);
@@ -43,7 +43,7 @@ public static ConfiguracoesWebNfe iniciaConfiguracoes(Estados estado, String amb
 		instance.setPastaSchemas(pastaSchemas);
 		instance.setVersaoNfe(ConstantesUtil.VERSAO.NFE);
 		if (log) {
-			System.out.println("Api Java Nfe Versão 4.00.4 - Samuel Olivera - samuk.exe@hotmail.com");
+            System.out.println("Api Java Nfe Versão 4.00.5 - Samuel Olivera - samuk.exe@hotmail.com");
 			System.out.println("Certificado: " + certificado.getTipo().toUpperCase() + " - "
 					+ certificado.getNome().toUpperCase() + " - Vencimento: " + certificado.getVencimento());
 			System.out.println("Ambiente: " + (ambiente.equals("1") ? "Produção" : "Homologação") + " - Estado: "
diff --git a/src/main/java/br/com/samuelweb/nfe/util/CDATAContentHandler.java b/src/main/java/br/com/samuelweb/nfe/util/CDATAContentHandler.java
index 9f9b7327..01318d3c 100644
--- a/src/main/java/br/com/samuelweb/nfe/util/CDATAContentHandler.java
+++ b/src/main/java/br/com/samuelweb/nfe/util/CDATAContentHandler.java
@@ -2,12 +2,11 @@
 import com.sun.xml.txw2.output.XMLWriter;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.io.Writer;
 import java.util.regex.Pattern;
 
 public class CDATAContentHandler extends XMLWriter {
-    public CDATAContentHandler(Writer writer, String encoding) throws IOException {
+    CDATAContentHandler(Writer writer, String encoding) {
         super(writer, encoding);
     }
 
diff --git a/src/main/java/br/com/samuelweb/nfe/util/Estados.java b/src/main/java/br/com/samuelweb/nfe/util/Estados.java
index 607883df..069f12a2 100644
--- a/src/main/java/br/com/samuelweb/nfe/util/Estados.java
+++ b/src/main/java/br/com/samuelweb/nfe/util/Estados.java
@@ -45,7 +45,7 @@ public enum Estados {
 	private final String codigoIbge;
 	private final String nome;
 
-	private Estados(String codigoIbge,String nome) {
+    Estados(String codigoIbge, String nome) {
 		this.codigoIbge = codigoIbge;
 		this.nome = nome;
 	}
diff --git a/src/main/java/br/com/samuelweb/nfe/util/NFCeUtil.java b/src/main/java/br/com/samuelweb/nfe/util/NFCeUtil.java
index f1c0a74d..45cb811a 100644
--- a/src/main/java/br/com/samuelweb/nfe/util/NFCeUtil.java
+++ b/src/main/java/br/com/samuelweb/nfe/util/NFCeUtil.java
@@ -6,12 +6,10 @@
 /** 
 * 
 * @author Samuel Oliveira
-*/  
-public class NFCeUtil {  
-  
-    private static String cHashQRCode;  
-  
-    /** 
+*/
+public class NFCeUtil {
+
+    /**
      * 
      * Funcao Responsavel por Devolver o QrCode já no padrão da Nota.
      * 
@@ -39,15 +37,15 @@ public static String getCodeQRCode(String chave, String versao, String ambiente,
         value.append("&dhEmi=").append(getHexa(dhEmi));  
         value.append("&vNF=").append(valorNF);  
         value.append("&vICMS=").append(valorICMS);  
-        value.append("&digVal=").append(getHexa(digVal));  
-        value.append("&cIdToken=").append(idToken);  
-        cHashQRCode = getHexa(getHash(value.toString() + CSC, "SHA-1")).toUpperCase();  
-  
-        StringBuilder ret = new StringBuilder();  
-        ret.append(urlConsulta).append("?");  
-        ret.append(value);  
-        ret.append("&cHashQRCode=").append(cHashQRCode);  
-        return ret.toString();  
+        value.append("&digVal=").append(getHexa(digVal));
+        value.append("&cIdToken=").append(idToken);
+        String cHashQRCode = getHexa(getHash(value.toString() + CSC, "SHA-1")).toUpperCase();
+
+        StringBuilder ret = new StringBuilder();
+        ret.append(urlConsulta).append("?");
+        ret.append(value);
+        ret.append("&cHashQRCode=").append(cHashQRCode);
+        return ret.toString();
     }  
   
  
diff --git a/src/main/java/br/com/samuelweb/nfe/util/ProxyUtil.java b/src/main/java/br/com/samuelweb/nfe/util/ProxyUtil.java
index 1587b18b..921d4c97 100644
--- a/src/main/java/br/com/samuelweb/nfe/util/ProxyUtil.java
+++ b/src/main/java/br/com/samuelweb/nfe/util/ProxyUtil.java
@@ -3,7 +3,7 @@
 import org.apache.axis2.transport.http.HttpTransportProperties;
 
 public class ProxyUtil {
-	 HttpTransportProperties.ProxyProperties proxyProperties;
+    private HttpTransportProperties.ProxyProperties proxyProperties;
 
 	public ProxyUtil(String ip, int porta, String usuario,String senha) {
 		   
diff --git a/src/main/java/br/com/samuelweb/nfe/util/XmlUtil.java b/src/main/java/br/com/samuelweb/nfe/util/XmlUtil.java
index 1edba17a..8ae0b281 100644
--- a/src/main/java/br/com/samuelweb/nfe/util/XmlUtil.java
+++ b/src/main/java/br/com/samuelweb/nfe/util/XmlUtil.java
@@ -220,12 +220,8 @@ public static <T> String objectToXml(Object obj) throws JAXBException, NfeExcept
         StringWriter sw = new StringWriter();
 
         if (obj.getClass().getSimpleName().equals(ENVIO_NFE) || obj.getClass().getSimpleName().equals(NFEPROC)) {
-            try {
-                CDATAContentHandler cdataHandler = new CDATAContentHandler(sw, "utf-8");
-                marshaller.marshal(element, cdataHandler);
-            } catch (IOException e) {
-                throw new NfeException(e.getMessage());
-            }
+            CDATAContentHandler cdataHandler = new CDATAContentHandler(sw, "utf-8");
+            marshaller.marshal(element, cdataHandler);
         } else {
             marshaller.marshal(element, sw);
         }
@@ -326,7 +322,7 @@ public static String dataNfe() throws NfeException {
             LocalDateTime dataASerFormatada = LocalDateTime.now();
             GregorianCalendar calendar = GregorianCalendar.from(dataASerFormatada.atZone(ZoneId.of("Brazil/East")));
 
-            XMLGregorianCalendar  xmlCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar);
+            XMLGregorianCalendar xmlCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar);
             xmlCalendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
 
             return (xmlCalendar.toString());
diff --git a/src/main/resources/Cacert b/src/main/resources/Cacert
index 1a12cfcd..28b1a8ee 100644
Binary files a/src/main/resources/Cacert and b/src/main/resources/Cacert differ