ok
Merge pull request #6 from jordimd/testone

testone -> master