improved on the macvim/gvim version