merged patches by @guidoreina