Revise [unite]mapping for input option
Merge branch 'master' into mac