Merge pull request #1 from Lafor8/master

Master
Merge pull request #2 from Lafor8/vins-integration

Merge pull request #1 from Lafor8/master