Merge branch 'master' of github.com:gems-uff/dyevc