Last changes to push to bitbucket