Pull Request final

Pull request to merge final project