new version

easier to read and improve
Merge pull request #1 from billias13/patch-1

new version