Merge pull request #532 from hunner/add_helper