Initial fork

Modifications made to work with Patchoo!