Bugs fixed and unused code removed
Merge pull request #5 from Spomky-Labs/develop

Bugs fixed and unused code removed