richfitz Merge pull request #250 from vimc/vimc-4193