Merge branch 'master' of github.com:vroman/edivc