significant update on code cleaning
Merge branch 'master' of https://github.com/cebedovii/Pylon