Boy, I just be outright stealing code now. But it looks nicer now. Fixes #234 Signed-off-by: Christopher Snowhill <kode54@gmail.com>