Removed dependance on external modules
Merge pull request #1 from demasu/master

Removed dependance on external modules