Changes after Balazs committed
I'm merging the changes.