Rewrite using tuples
Merge pull request #1 from xnaveira/dev

Rewrite using tuples