Test updated
Bugs fixed
Merge pull request #11 from Spomky-Labs/develop

Bugs fixed