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

Bugs fixed