Merge from juanpicado repository

Tested with Intern