From b83392df21c3fc753c6ceee28a6d636903203ab8 Mon Sep 17 00:00:00 2001
From: Jesse MacFadyen <purplecabbage@gmail.com>
Date: Mon, 5 Oct 2015 17:23:59 -0700
Subject: [PATCH] This closes #56, This closes #44