Better helpers
Merge pull request #10 from kirs/better-helpers

Better helpers