Revise jplus-delimiter of sh
Merge branch 'master' into mac