True implementation
Merge pull request #3 from diegum70/feature/net-improvement

True implementation