Merge pull request #1 from drdangersimon/master

Trying to commit this to vribeiro83!
Minor modifications
- Made so that csv was tab separated, where possible
updating
merged
Merge with valerios