Merge branch 'ph/parseopt-sh'