Import code from local 'repo'

latest commit d6b8aa1955
Rodrigo Moya rodrmoya authored