Merge pull request #13 from selfshadow/patches-2