Addressing issue in #17

This is a proper fix for #17 addressing @OliverJAsh's issue. Now if only I could figure out why builds just don't want to work anymore.