Converted to module
Merge pull request #1 from ChrisRose/dev

Converted to module