Merge PR#1 by hand