few changes fixed..
Merge branch 'master' of https://github.com/pradeepnarava/tfh_latest