Modularized for use by other software
Merge pull request #2 from technoskald/master

Modularized