Merge pull request #72 from burlock/development

casi últimos cambios en upload