Seem to be working.

A few paths have changed in the latest version. Have not thoroughly
tested.