Before changes
Optimize the class
Merge pull request #5 from acropolistel/dev

Dev