Merge pull request #498 from danvk/more-spacing