Update main.tex
Merge branch 'patch-1' of git://github.com/jofreund/abrupt into jofreund-patch-1

Conflicts:
	doc/paper/main.tex
Merge pull request #9 from manuel84/jofreund-patch-1

Jofreund patch 1