Removed the use of the 'self' module

Fixes #2 (GitHub)