Update project to include fixes and features from other projects.