More updates to help function
Merge branch 'master' into work