Code design
Merge pull request #2 from Spomky-Labs/develop

Code design