Merge pull request #304 from danvk/merge-hairline