Code design
Bugs fixed
Merge pull request #4 from Spomky-Labs/develop

Bugs fixed and code design