Merge pull request #1 from cartoloupe/new-branch-for-patchwork

@jasonlong added a todo