Update
Merge pull request #4 from EtixPP/master

Update- Better Code design