Update Cuztom Helper Class
Merge branch 'develop'