Merge pull request #30 from abdulrauf/master

helpers issue in production