merged with master1 manually

que parida! xD