Checking in fixes
Merge pull request #253 from meganap/agut

Checking in fixes