merge w. giulio (master)

[More info](http://dx.doi.org/10.1080/2151237X.2008.10129266)