Fechando issue restante
closes #1