Pulled in c48688230390d5ac216d2bcd9b5204b831ef8141 to fix #15 There's a couple of other ways to do this, but will require a restructure.
