Sources fixed
Merge pull request #2 from czuriaga/master

Data files fixed and upgraded