Merge pull request #15 from DavidS/master

Several upgrades to the module