fork from alswl

Hi @alswl 
I'm merging your fork back in gre/play2vim :-)