added custom helpers
Merge branch 'helpers' into develop