Daniel Verdu
merged changes
d984001