Pushing changes from yesterday. Fixed some references.
Merge branch 'master' of http://github.com/sharyari/uppsats