Merge pull request #189 from garyb/master

Fix for the Math module (and others)