diff --git a/Dockerfile b/Dockerfile
index 28d71488..95445897 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz loky scipy shapely numpy pyproj psutil
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings gippy loky scipy shapely numpy pyproj psutil
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
diff --git a/core2.Dockerfile b/core2.Dockerfile
index 29ceb6df..e64fb827 100644
--- a/core2.Dockerfile
+++ b/core2.Dockerfile
@@ -19,7 +19,7 @@ libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/OpenDroneMap/gippy/archive/v0.3.9.tar.gz loky scipy shapely numpy pyproj psutil
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings gippy loky scipy shapely numpy pyproj psutil
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
diff --git a/opendm/dem/commands.py b/opendm/dem/commands.py
index 3d222e97..40896a95 100644
--- a/opendm/dem/commands.py
+++ b/opendm/dem/commands.py
@@ -101,13 +101,13 @@ def gap_fill(filenames, fout, interpolation='nearest'):
 
     filenames = sorted(filenames)
 
-    imgs = gippy.GeoImages(filenames)
-    nodata = imgs[0][0].NoDataValue()
-    arr = imgs[0][0].Read()
+    imgs = map(gippy.GeoImage, filenames)
+    nodata = imgs[0][0].nodata()
+    arr = imgs[0][0].read()
 
-    for i in range(1, imgs.size()):
+    for i in range(1, len(imgs)):
         locs = numpy.where(arr == nodata)
-        arr[locs] = imgs[i][0].Read()[locs]
+        arr[locs] = imgs[i][0].read()[locs]
 
     # interpolation at bad points
     goodlocs = numpy.where(arr != nodata)
@@ -115,10 +115,10 @@ def gap_fill(filenames, fout, interpolation='nearest'):
     arr[badlocs] = griddata(goodlocs, arr[goodlocs], badlocs, method=interpolation)
 
     # write output
-    imgout = gippy.GeoImage(fout, imgs[0])
-    imgout.SetNoData(nodata)
-    imgout[0].Write(arr)
-    fout = imgout.Filename()
+    imgout = gippy.GeoImage.create_from(imgs[0], fout)
+    imgout.set_nodata(nodata)
+    imgout[0].write(arr)
+    fout = imgout.filename()
     imgout = None
 
     log.ODM_INFO('Completed gap-filling to create %s in %s' % (os.path.relpath(fout), datetime.now() - start))