Fixed little bug of collision
Merge branch 'master' of https://github.com/ging/vish into vish-b3