diff --git a/src/get-latest-version.ts b/src/get-latest-version.ts
index b7f9382..f0031a3 100644
--- a/src/get-latest-version.ts
+++ b/src/get-latest-version.ts
@@ -1,19 +1,34 @@
-const XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
+import fetch from 'node-fetch';
 
-export default function getLatestVersion(): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-    const url: string = 'https://formulae.brew.sh/api/formula/hugo.json';
-    xhr.open('GET', url);
-    xhr.send();
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState === 4 && xhr.status === 200) {
-        const result = JSON.parse(xhr.responseText);
-        const latestVersion: string = result.versions.stable;
-        resolve(latestVersion);
-      } else if (xhr.readyState === 4 && xhr.status !== 200) {
-        reject(`ERROR: got status ${xhr.status} of ${url}`);
-      }
-    };
-  });
+export function getURL(org: string, repo: string, api: string): string {
+  let url: string = '';
+
+  if (api === 'brew') {
+    url = `https://formulae.brew.sh/api/formula/${repo}.json`;
+  } else if (api === 'github') {
+    url = `https://api.github.com/repos/${org}/${repo}/releases/latest`;
+  }
+
+  return url;
+}
+
+export async function getLatestVersion(
+  org: string,
+  repo: string,
+  api: string
+): Promise<string> {
+  try {
+    const url = getURL(org, repo, api);
+    const response = await fetch(url);
+    const json = await response.json();
+    let latestVersion: string = '';
+    if (api === 'brew') {
+      latestVersion = json.versions.stable;
+    } else if (api === 'github') {
+      latestVersion = json.tag_name;
+    }
+    return latestVersion;
+  } catch (e) {
+    return e;
+  }
 }
diff --git a/src/index.ts b/src/index.ts
index 3b3925d..a7224c2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,35 +1,66 @@
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
-import getLatestVersion from './get-latest-version';
-import installer from './installer';
+import {getLatestVersion} from './get-latest-version';
+import {installer} from './installer';
 
-// most @actions toolkit packages have async methods
-async function run() {
-  const showVersion = async () => {
-    await exec.exec('hugo version');
-  };
+export interface actionResult {
+  exitcode: number;
+  output: string;
+}
 
+export async function showVersion(
+  cmd: string,
+  args: string[]
+): Promise<actionResult> {
   try {
-    const hugoVersion: string = core.getInput('hugo-version');
+    let result: actionResult = {
+      exitcode: 0,
+      output: ''
+    };
 
-    if (hugoVersion === '' || hugoVersion === 'latest') {
-      getLatestVersion().then(
-        async function(latestVersion): Promise<void> {
-          console.log(`Hugo version: ${latestVersion} (${hugoVersion})`);
-          await installer(latestVersion);
-          await showVersion();
-        },
-        function(error) {
-          core.setFailed(error);
+    const options = {
+      listeners: {
+        stdout: (data: Buffer) => {
+          result.output += data.toString();
         }
-      );
+      }
+    };
+
+    result.exitcode = await exec.exec(cmd, args, options);
+    core.debug(`
+      exit code: ${result.exitcode}
+      stdout: ${result.output}
+    `);
+    return result;
+  } catch (e) {
+    return e;
+  }
+}
+
+async function run() {
+  try {
+    const toolVersion: string = core.getInput('hugo-version');
+    let installVersion: string = '';
+
+    let result: actionResult = {
+      exitcode: 0,
+      output: ''
+    };
+
+    if (toolVersion === '' || toolVersion === 'latest') {
+      installVersion = await getLatestVersion('gohugoio', 'hugo', 'brew');
     } else {
-      console.log(`Hugo version: ${hugoVersion}`);
-      await installer(hugoVersion);
-      await showVersion();
+      installVersion = toolVersion;
     }
-  } catch (error) {
-    core.setFailed(error.message);
+
+    core.info(`hugo version: ${installVersion}`);
+    await installer(installVersion);
+    result = await showVersion('hugo', ['version']);
+
+    return result;
+  } catch (e) {
+    core.setFailed(`Action failed with error ${e}`);
+    return e;
   }
 }
 
diff --git a/src/installer.ts b/src/installer.ts
index e2513a4..5ce0f37 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -16,7 +16,7 @@ if (!tempDir) {
   tempDir = path.join(baseTempLocation, 'tmp');
 }
 
-export default async function installer(version: string) {
+export async function installer(version: string) {
   try {
     const extended: string = core.getInput('extended');
     console.log(`Hugo extended: ${extended}`);