More changes merged from Getprinting3d