amend
Merge branch 'nuevarama' of https://github.com/sregidor/remote into nuevarama