Bugs fixed
Bugs fixed and doc updated
Merge pull request #2 from Spomky-Labs/develop

Bugs fixed and doc updated