Update the branch from master to amsterdam