Merge pull request #41 from cocreature/helpers