Merge pull request #743 from pooler/usagefix