Bringing version up to date with latest changes including the WF Driver.