commit from geir_pc
Merge branch 'master' of https://github.com/geirivtu/NRWD
more stuff latex