Merge pull request #12 from selfshadow/patches-cp