Origin/luis development

pull request (2) 20/12/14