More corrections
Merge branch 'master' of github.com:frmi/sw605f14-latex