Crittercism fixes
Merge pull request #4 from uken/crittercism_fixes

Crittercism fixes