patching up patching troubles
Merge pull request #24 from teverett/master

patching up patching troubles