Fixes #53 hopefully it no longer looks like ass :P