Solving printing issues
Merge and typos
Merge branch 'master' of https://github.com/aloy/paper_competition_2012
Final version (pushed a bit late)