Merge pull request #1 from mkeef1/dev

module name changed
Merge pull request #2 from mkeef1/dev

Dev
fixed git problems
Merge pull request #3 from mkeef1/matt

Matt