diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index f043bde7..b2ab9ac8 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -7,7 +7,7 @@
 
 
 import { fieldTagNames, fieldTagTypes, fieldTypeNames, geoKeyNames } from './globals';
-import { assign, endsWith, forEach, invert, times } from './utils';
+import { assign, endsWith, forEach, invert, times, isTypedFloatArray, isTypedUintArray, isTypedIntArray } from './utils';
 
 
 const tagName2Code = invert(fieldTagNames);
@@ -252,11 +252,17 @@ const encodeImage = (values, width, height, metadata) => {
 
   const prfx = new Uint8Array(encodeIfds([ifd]));
 
-  const img = new Uint8Array(values);
+  // This should allow other kinds of typed arrays to be used. Uint8 is just a view of the real underlying data.
+  let img = undefined
+  if (ArrayBuffer.isView(values)) { // It is a typed array
+    img = new Uint8Array(values.buffer);
+  } else { // It is a normal js array
+    img = new Uint8Array(values)
+  }
 
   const samplesPerPixel = ifd[277];
 
-  const data = new Uint8Array(numBytesInIfd + (width * height * samplesPerPixel));
+  const data = new Uint8Array(numBytesInIfd + (img.length * samplesPerPixel));
   times(prfx.length, (i) => { data[i] = prfx[i]; });
   forEach(img, (value, i) => {
     data[numBytesInIfd + i] = value;
@@ -333,9 +339,12 @@ const writeGeotiff = (data, metadata) => {
   delete metadata.width;
 
   // consult https://www.loc.gov/preservation/digital/formats/content/tiff_tags.shtml
-
   if (!metadata.BitsPerSample) {
-    metadata.BitsPerSample = times(numBands, () => 8);
+    let bitsPerSample = 8
+    if (ArrayBuffer.isView(flattenedValues)) {
+      bitsPerSample = 8 * flattenedValues.BYTES_PER_ELEMENT
+    }
+    metadata.BitsPerSample = times(numBands, () => bitsPerSample);
   }
 
   metadataDefaults.forEach((tag) => {
@@ -368,7 +377,17 @@ const writeGeotiff = (data, metadata) => {
   }
 
   if (!metadata.SampleFormat) {
-    metadata.SampleFormat = times(numBands, () => 1);
+    let sampleFormat = 1
+    if (isTypedFloatArray(flattenedValues)) {
+      sampleFormat = 3
+    }
+    if (isTypedIntArray(flattenedValues)) {
+      sampleFormat = 2
+    }
+    if (isTypedUintArray(flattenedValues)) {
+      sampleFormat = 1
+    }
+    metadata.SampleFormat = times(numBands, () => sampleFormat);
   }
 
 
diff --git a/src/utils.js b/src/utils.js
index 75e8092c..6a88227f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -76,3 +76,38 @@ export function toArrayRecursively(input) {
   }
   return input;
 }
+
+export function isTypedFloatArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr === Float32Array || ctr === Float64Array) {
+      return true
+    }
+  }
+  return false
+}
+
+export function isTypedIntArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr == Int8Array || ctr === Int16Array || ctr === Int32Array) {
+      return true
+    }
+  }
+  return false
+}
+
+export function isTypedUintArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr == Uint8Array || ctr === Uint16Array || ctr === Uint32Array || ctr === Uint8ClampedArray) {
+      return true
+    }
+  }
+  return false
+}
+
+
+
+
+
diff --git a/test/index.html b/test/index.html
index 237c8a6e..bb02838e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -8,7 +8,7 @@
 <select id="bands">
 </select>
 
-<script src="geotiff.bundle.js"></script>
+<script src="../dist/geotiff.bundle.js"></script>
 <script src="lib/plotty.min.js"></script>
 
 <script>