Revise neocomplete variables
Merge branch 'master' into mac