merge w. giulio (master)

[More info](http://dx.doi.org/10.1007/3-540-35273-2_4)