From 1923d4e91e320d392ac42f43b472d1ddf044f23b Mon Sep 17 00:00:00 2001
From: Jesse MacFadyen <purplecabbage@gmail.com>
Date: Fri, 18 Sep 2015 12:55:11 -0700
Subject: [PATCH] Close #34, merged