merge to master
Merge branch 'master' of github.com:elliehoshi/ocvr