Some code enhancement
Merge pull request #4 from a-bougouffa/master

Some code enhancement