Newest update to pi3d
merge