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

Tests updated and bugs fixed