Updating master branch
Merge branch 'master' of https://github.com/berkeley-gif/vtm