Merge pull request #279 from apenney/fix-spacing