#139 implementado!
merge upstream. fix urls
Merge branch 'edvm-master'