Merge from juanpicado repository