Merge pull request #78 from jcnventura/data_dir