initial
Merge pull request #10 from rdquintas/master

PR from Ricardo