Update for release to r-forge