initial commit of new version
Merges 'develop'
Initial commit for module rewrite
Merge pull request #4 from lyndsysimon/master

Begins refactor