Fixes #3 although there are still some minor whitespace inconsistencies.