All changes fixed from previous version

Changed project name and all associated issues