Merge branch 'master' of https://github.com/karenrao/vss.git