Corrected deprecation warnings
Merge pull request #16 from retr0h/retr0h/old-stubs

Retr0h/old stubs