Merge pull request #456 from colemanw/help