Reverting module to previous working version and then adding chris's fix back in
Merge pull request #2 from paulsheldrake/working

Reverting module to previous working version and then adding chris's fix...