edits...
Merge pull request #2 from kerautret/tmp

miguel corrections.