True implementation
Merge pull request #1 from diegum70/feature/true-impl

True implementation