Changes based on the comments of Berthold Daum.

git-svn-id: http://lire.googlecode.com/svn/trunk@197 f280a053-6817-128d-8a7e-cdf98506035a