True implementation
Merge pull request #2 from diegum70/feature/dat-improvement

True implementation