pjf Merge PR #6 'menu-function' from @s-t-e-v-e-n-k